From d43d6abbae51649aad5973cd19bef544fb3f6752 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Wed, 26 Jul 2023 11:26:46 +0200
Subject: [PATCH 1/8] chore: replace tslint with eslint and fix linting issues

---
 .eslintignore                                 |   3 +-
 .eslintrc.js                                  |  66 +-
 about_preload.js                              |   1 +
 debug_log_preload.js                          |   1 +
 libsession.worker.config.js                   |   1 +
 package.json                                  |  13 +-
 password_preload.js                           |   1 +
 playwright.config.ts                          |   3 +-
 preload.js                                    |   3 +-
 sass.config.js                                |   4 +-
 ts/components/AboutView.tsx                   |   2 +-
 ts/components/CaptionEditor.tsx               |   2 -
 ts/components/DebugLogView.tsx                |   5 +-
 ts/components/MemberListItem.tsx              |   5 +-
 ts/components/SessionInboxView.tsx            |  46 +-
 ts/components/SessionPasswordPrompt.tsx       |  15 +-
 ts/components/SessionToastContainer.tsx       |   1 -
 ts/components/SessionWrapperModal.tsx         |   7 +-
 ts/components/SplitViewContainer.tsx          |   2 +-
 ts/components/avatar/Avatar.tsx               |   5 +-
 .../AvatarPlaceHolder/AvatarPlaceHolder.tsx   |   8 +-
 .../AvatarPlaceHolder/ClosedGroupAvatar.tsx   |   4 +-
 ts/components/basic/Flex.tsx                  |   6 +-
 ts/components/basic/MessageBodyHighlight.tsx  |   1 -
 ts/components/basic/SessionHTMLRenderer.tsx   |  11 +-
 ts/components/basic/SessionIdEditable.tsx     |   4 +-
 ts/components/basic/SessionRadio.tsx          |   4 +-
 ts/components/basic/SessionRadioGroup.tsx     |   8 +-
 ts/components/basic/SessionToast.tsx          |  12 +-
 ts/components/basic/SessionToggle.tsx         |   2 +-
 ts/components/button/MenuButton.tsx           |   1 -
 ts/components/calling/CallButtons.tsx         |  13 +-
 .../calling/CallInFullScreenContainer.tsx     |   4 +-
 .../calling/DraggableCallContainer.tsx        |  13 +-
 .../calling/InConversationCallContainer.tsx   |   8 +-
 ts/components/calling/IncomingCallDialog.tsx  |   6 +-
 ts/components/conversation/AddMentions.tsx    |   4 +-
 ts/components/conversation/ContactName.tsx    |   8 +-
 .../conversation/ConversationHeader.tsx       |   4 +-
 ts/components/conversation/ExpireTimer.tsx    |   5 +-
 ts/components/conversation/H5AudioPlayer.tsx  |   2 +-
 ts/components/conversation/Image.tsx          |   4 +-
 ts/components/conversation/ImageGrid.tsx      |   3 +-
 .../conversation/SessionConversation.tsx      |  16 +-
 .../conversation/SessionEmojiPanel.tsx        |   6 +-
 .../conversation/SessionMessagesList.tsx      |   2 +-
 .../SessionMessagesListContainer.tsx          |   9 +-
 .../SessionQuotedMessageComposition.tsx       |   9 +-
 .../conversation/SessionRecording.tsx         |  14 +-
 .../conversation/SessionRightPanel.tsx        |  40 +-
 .../conversation/SessionStagedLinkPreview.tsx |   6 +-
 .../conversation/StagedLinkPreview.tsx        |   2 +-
 .../StagedPlaceholderAttachment.tsx           |   1 -
 ts/components/conversation/Timestamp.tsx      |   1 -
 ts/components/conversation/TypingBubble.tsx   |   2 +-
 .../composition/CompositionBox.tsx            |  96 +--
 .../composition/CompositionButtons.tsx        |   1 +
 .../composition/EmojiQuickResult.tsx          |   2 +-
 .../media-gallery/DocumentListItem.tsx        |   2 +-
 .../media-gallery/MediaGridItem.tsx           |   4 +-
 .../media-gallery/groupMediaItemsByDate.ts    |  10 +-
 .../message-content/ClickToTrustSender.tsx    |   2 +-
 .../message-content/MessageAttachment.tsx     |  12 +-
 .../message-content/MessageAuthorText.tsx     |   2 +-
 .../message/message-content/MessageAvatar.tsx |  26 +-
 .../message/message-content/MessageBody.tsx   |  35 +-
 .../message-content/MessageContent.tsx        |  18 +-
 .../MessageContentWithStatus.tsx              |  15 +-
 .../message-content/MessageContextMenu.tsx    | 273 +++++----
 .../message/message-content/MessageQuote.tsx  | 117 ++--
 .../message-content/MessageReactBar.tsx       |  14 +-
 .../message/message-content/Quote.tsx         |  10 +-
 .../message/message-content/quote/Quote.tsx   |   3 +-
 .../quote/QuoteIconContainer.tsx              |   7 +-
 .../message-content/quote/QuoteImage.tsx      |   6 +-
 .../message-item/GenericReadableMessage.tsx   |  18 +-
 .../message/message-item/GroupInvitation.tsx  |   7 +-
 .../message-item/GroupUpdateMessage.tsx       |   2 +-
 .../message/message-item/Message.tsx          |   5 +-
 .../message/message-item/MessageDetail.tsx    |  15 +-
 .../message/message-item/ReadableMessage.tsx  |  10 +-
 .../message/reactions/Reaction.tsx            |   1 -
 .../message/reactions/ReactionPopup.tsx       |  17 +-
 ts/components/dialog/BanOrUnbanUserDialog.tsx |  27 +-
 ts/components/dialog/DeleteAccountModal.tsx   |   2 +-
 ts/components/dialog/EditProfileDialog.tsx    |  14 +-
 ts/components/dialog/InviteContactsDialog.tsx |  10 +-
 ts/components/dialog/ModeratorsAddDialog.tsx  |   7 +-
 .../dialog/ModeratorsRemoveDialog.tsx         |  16 +-
 .../dialog/OnionStatusPathDialog.tsx          |  11 +-
 ts/components/dialog/ReactClearAllModal.tsx   |   1 -
 ts/components/dialog/ReactListModal.tsx       |  26 +-
 ts/components/dialog/SessionConfirm.tsx       |  12 +-
 ts/components/dialog/SessionModal.tsx         | 136 -----
 .../dialog/SessionNicknameDialog.tsx          |   5 +-
 .../dialog/SessionPasswordDialog.tsx          |   9 +-
 ts/components/dialog/SessionSeedModal.tsx     |  76 +--
 .../dialog/UpdateGroupMembersDialog.tsx       |  12 +-
 .../dialog/UpdateGroupNameDialog.tsx          |   9 +-
 ts/components/dialog/UserDetailsDialog.tsx    |   2 +-
 .../icon/DropDownAndToggleButton.tsx          |   1 -
 ts/components/icon/Icons.tsx                  |   2 +
 .../icon/MemberAvatarPlaceHolder.tsx          |   1 -
 ts/components/icon/SessionIcon.tsx            |  47 +-
 ts/components/icon/SessionIconButton.tsx      |   8 +-
 ts/components/leftpane/ActionsPanel.tsx       |  45 +-
 ts/components/leftpane/ContactListItem.tsx    |   2 +-
 .../leftpane/LeftPaneMessageSection.tsx       |  10 +-
 .../leftpane/LeftPaneSettingSection.tsx       |   8 +-
 .../ConversationListItem.tsx                  |  15 +-
 .../conversation-list-item/HeaderItem.tsx     |   2 +-
 .../leftpane/overlay/OverlayClosedGroup.tsx   |  11 +-
 .../leftpane/overlay/OverlayCommunity.tsx     |  15 +-
 .../leftpane/overlay/OverlayMessage.tsx       |  24 +-
 .../overlay/OverlayMessageRequest.tsx         |   2 +-
 .../overlay/SessionJoinableDefaultRooms.tsx   |   5 +-
 .../overlay/choose-action/ContactRow.tsx      |   2 +-
 .../choose-action/OverlayChooseAction.tsx     |  43 +-
 ts/components/lightbox/Lightbox.tsx           |  11 +-
 ts/components/lightbox/LightboxGallery.tsx    |  23 +-
 ts/components/menu/ConversationHeaderMenu.tsx |   4 +-
 .../menu/ConversationListItemContextMenu.tsx  |   5 +-
 ts/components/menu/Menu.tsx                   |  32 +-
 .../menu/MessageRequestBannerContextMenu.tsx  |   4 +-
 .../registration/RegistrationStages.tsx       |  17 +-
 .../registration/RegistrationUserDetails.tsx  |   4 -
 ts/components/registration/SignInTab.tsx      |   2 -
 ts/components/registration/SignUpTab.tsx      |   4 +-
 ts/components/search/MessageSearchResults.tsx |   3 +-
 ts/components/search/SearchResults.tsx        |   8 +-
 ts/components/settings/BlockedList.tsx        |   2 -
 .../SessionNotificationGroupSettings.tsx      |   4 +-
 .../settings/SessionSettingListItem.tsx       |   3 +-
 ts/components/settings/SessionSettings.tsx    |  11 +-
 .../settings/SettingsThemeSwitcher.tsx        |  10 +-
 .../settings/ZoomingSessionSlider.tsx         |   3 +-
 .../settings/section/CategoryAppearance.tsx   |   2 +-
 .../section/CategoryConversations.tsx         |   4 +-
 .../settings/section/CategoryPermissions.tsx  |   3 +-
 .../settings/section/CategoryPrivacy.tsx      |   7 +-
 ts/data/configDump/configDump.ts              |   1 +
 ts/data/data.ts                               |  13 +-
 ts/data/dataInit.ts                           |   4 -
 ts/data/dataUtils.ts                          |   4 +-
 ts/data/opengroups.ts                         |   3 +-
 ts/hooks/useAppFocused.ts                     |   2 +-
 ts/hooks/useEncryptedFileFetch.ts             |  25 +-
 ts/hooks/useFocusMount.ts                     |   2 +-
 ts/hooks/useModulo.ts                         |   2 +-
 ts/hooks/useParamSelector.ts                  |   2 +-
 ts/hooks/useSet.ts                            |   1 -
 ts/hooks/useVideoEventListener.ts             |   9 +-
 ts/interactions/conversationInteractions.ts   |  12 +-
 .../conversations/unsendingInteractions.ts    |  34 +-
 ts/interactions/messageInteractions.ts        |   1 -
 ts/mains/about_start.tsx                      |   1 -
 ts/mains/main_node.ts                         |  19 +-
 ts/mains/main_renderer.tsx                    |  30 +-
 ts/mains/password_start.tsx                   |   1 -
 ts/models/conversation.ts                     |  45 +-
 ts/models/message.ts                          |  72 +--
 ts/models/messageFactory.ts                   |   1 +
 ts/node/attachment_channel.ts                 |   7 +-
 ts/node/config.ts                             |   6 +-
 ts/node/config/base_config.ts                 |   1 -
 ts/node/config/user_config.ts                 |   1 -
 ts/node/database_utility.ts                   |   7 +-
 ts/node/encrypt_attachment_buffer.ts          |   3 -
 ts/node/global_errors.ts                      |   3 +-
 ts/node/locale.ts                             |   1 -
 ts/node/logging.ts                            |   5 +-
 ts/node/menu.ts                               |   8 +-
 ts/node/migration/sessionMigrations.ts        |  29 +-
 ts/node/migration/signalMigrations.ts         |  10 +-
 ts/node/permissions.ts                        |   3 +-
 ts/node/protocol_filter.ts                    |   3 +-
 ts/node/spell_check.ts                        |   2 -
 ts/node/sql.ts                                |  17 +-
 ts/node/sql_calls/config_dump.ts              |   1 +
 ts/node/sql_channel.ts                        |   1 -
 ts/receiver/attachments.ts                    |   3 +-
 ts/receiver/cache.ts                          |   7 +-
 ts/receiver/closedGroups.ts                   |  30 +-
 ts/receiver/configMessage.ts                  |   8 +-
 ts/receiver/contentMessage.ts                 | 100 +--
 ts/receiver/dataMessage.ts                    |  24 +-
 ts/receiver/queuedJob.ts                      |   8 +-
 ts/receiver/receiver.ts                       |  13 +-
 .../apis/file_server_api/FileServerApi.ts     |   3 +-
 .../open_group_api/opengroupV2/ApiUtil.ts     |   6 +-
 .../opengroupV2/JoinOpenGroupV2.ts            |   7 +-
 .../opengroupV2/OpenGroupManagerV2.ts         |  12 +-
 .../opengroupV2/OpenGroupPollingUtils.ts      |   5 +-
 .../opengroupV2/OpenGroupServerPoller.ts      |   9 +-
 .../opengroupV2/SogsFilterDuplicate.ts        |   2 +-
 .../open_group_api/sogsv3/knownBlindedkeys.ts |   8 +-
 .../apis/open_group_api/sogsv3/sogsApiV3.ts   |  17 +-
 .../open_group_api/sogsv3/sogsBlinding.ts     |  14 +-
 .../open_group_api/sogsv3/sogsV3BatchPoll.ts  |   3 +-
 .../sogsv3/sogsV3Capabilities.ts              |   7 +-
 .../sogsv3/sogsV3ClearReaction.ts             |   3 +-
 .../open_group_api/sogsv3/sogsV3FetchFile.ts  |   2 +-
 .../sogsv3/sogsV3MutationCache.ts             |   3 +-
 .../open_group_api/sogsv3/sogsV3RoomInfos.ts  |   2 +-
 .../sogsv3/sogsV3SendMessage.ts               |   2 +-
 .../sogsv3/sogsV3SendReaction.ts              |   1 -
 .../open_group_api/utils/OpenGroupUtils.ts    |   7 +-
 ts/session/apis/seed_node_api/SeedNodeAPI.ts  |  10 +-
 ts/session/apis/snode_api/SNodeAPI.ts         |   6 +-
 .../apis/snode_api/SnodeRequestTypes.ts       |   4 +-
 ts/session/apis/snode_api/batchRequest.ts     |   1 +
 ts/session/apis/snode_api/expire.ts           |   2 +
 ts/session/apis/snode_api/getNetworkTime.ts   |   1 -
 ts/session/apis/snode_api/hfHandling.ts       |   3 +-
 ts/session/apis/snode_api/namespaces.ts       |   2 +
 ts/session/apis/snode_api/onions.ts           |  32 +-
 ts/session/apis/snode_api/onsResolve.ts       |   2 +-
 ts/session/apis/snode_api/sessionRpc.ts       |   8 +-
 ts/session/apis/snode_api/snodePool.ts        |   9 +-
 ts/session/apis/snode_api/swarmPolling.ts     |  11 +-
 ts/session/constants.ts                       |   3 -
 .../conversations/ConversationController.ts   |   7 +-
 ts/session/conversations/createClosedGroup.ts |  76 +--
 ts/session/crypto/BufferPadding.ts            |   4 +-
 .../crypto/DecryptedAttachmentsManager.ts     |  30 +-
 ts/session/crypto/MessageEncrypter.ts         |   5 +-
 ts/session/crypto/index.ts                    |  11 +-
 ts/session/crypto/mnemonic.ts                 |  22 +-
 ts/session/group/closed-group.ts              |   7 +-
 .../messages/incoming/IncomingMessage.ts      |   5 +-
 .../outgoing/controlMessage/CallMessage.ts    |   1 +
 .../DataExtractionNotificationMessage.ts      |   4 +-
 .../controlMessage/MessageRequestResponse.ts  |   1 -
 .../controlMessage/SharedConfigMessage.ts     |   2 +-
 .../group/ClosedGroupAddedMembersMessage.ts   |   1 -
 .../group/ClosedGroupEncryptionPairMessage.ts |   3 +-
 .../ClosedGroupEncryptionPairReplyMessage.ts  |   2 +-
 .../group/ClosedGroupMemberLeftMessage.ts     |   1 -
 .../group/ClosedGroupNameChangeMessage.ts     |   1 -
 .../group/ClosedGroupRemovedMembersMessage.ts |   1 -
 .../ClosedGroupVisibleMessage.ts              |   2 +-
 ts/session/onions/onionPath.ts                |  29 +-
 ts/session/onions/onionSend.ts                |  10 +-
 ts/session/onions/onionv4.ts                  |   2 +-
 ts/session/sending/MessageQueue.ts            |  10 +-
 ts/session/sending/MessageSender.ts           |  16 +-
 ts/session/sending/MessageSentHandler.ts      |   1 -
 ts/session/sending/PendingMessageCache.ts     |  10 +-
 ts/session/tslint.json                        |   7 -
 ts/session/types/PubKey.ts                    |   5 +-
 ts/session/utils/Attachments.ts               |   3 +-
 ts/session/utils/AttachmentsDownload.ts       |  16 +-
 ts/session/utils/AttachmentsV2.ts             |   6 +-
 ts/session/utils/JobQueue.ts                  |   2 +-
 ts/session/utils/Messages.ts                  |   4 +-
 ts/session/utils/Performance.ts               |   2 -
 ts/session/utils/Promise.ts                   |  18 +-
 ts/session/utils/TaskWithTimeout.ts           |   7 +-
 ts/session/utils/User.ts                      |   2 +-
 ts/session/utils/calling/CallManager.ts       |  63 +-
 ts/session/utils/job_runners/JobRunner.ts     |   5 +-
 ts/session/utils/job_runners/PersistedJob.ts  |   1 -
 .../job_runners/jobs/AvatarDownloadJob.ts     |  13 +-
 .../job_runners/jobs/ConfigurationSyncJob.ts  |  44 +-
 .../utils/libsession/libsession_utils.ts      |   5 +
 .../libsession/libsession_utils_contacts.ts   |  14 +-
 .../libsession_utils_convo_info_volatile.ts   |   7 +-
 .../libsession_utils_user_groups.ts           |   9 +-
 ts/session/utils/sync/syncUtils.ts            |   9 +-
 ts/shims/events.ts                            |   1 -
 ts/state/actions.ts                           |   2 +-
 ts/state/createStore.ts                       |  20 +-
 ts/state/ducks/conversations.ts               |  14 +-
 ts/state/ducks/defaultRooms.tsx               |   2 +-
 ts/state/ducks/modalDialog.tsx                |   3 +-
 ts/state/ducks/search.ts                      |   5 +-
 ts/state/ducks/section.tsx                    |   1 +
 ts/state/ducks/settings.tsx                   |   4 +-
 ts/state/ducks/sogsRoomInfo.tsx               |   2 +-
 ts/state/ducks/stagedAttachments.ts           |   2 +-
 ts/state/reducer.ts                           |   1 -
 ts/state/selectors/conversations.ts           |  37 +-
 ts/state/selectors/messages.ts                |  50 +-
 ts/state/selectors/onions.ts                  |   2 +-
 ts/state/selectors/search.ts                  |   2 +-
 ts/test/automation/create_user.spec.ts        |   4 +-
 ts/test/automation/delete_account.spec.ts     |   3 +-
 .../automation/disappearing_messages.spec.ts  |   2 -
 ts/test/automation/linked_device_user.spec.ts |   1 -
 ts/test/automation/message_checks.spec.ts     |   1 +
 ts/test/automation/password.spec.ts           |   1 -
 ts/test/automation/setup/beforeEach.ts        |   3 +-
 ts/test/automation/setup/create_group.ts      |   2 +-
 ts/test/automation/setup/new_user.ts          |   4 +-
 ts/test/automation/setup/open.ts              |   1 -
 .../automation/setup/recovery_using_seed.ts   |   2 +-
 ts/test/automation/setup/sessionTest.ts       |   2 +
 ts/test/automation/setup/test_user.ts         |   2 -
 ts/test/automation/tslint.json                |  10 -
 ts/test/automation/user_actions.spec.ts       |   4 +-
 ts/test/automation/utilities/leave_group.ts   |   2 +-
 ts/test/automation/utilities/linked_device.ts |   1 -
 ts/test/automation/utilities/message.ts       |   3 +-
 ts/test/automation/utilities/rename_group.ts  |   2 +-
 ts/test/automation/utilities/send_message.ts  |   2 +-
 ts/test/automation/utilities/utils.ts         |  14 +-
 .../media-gallery/groupMessagesByDate_test.ts |   1 -
 .../unit/crypto/MessageEncrypter_test.ts      |  11 +-
 .../crypto/OpenGroupAuthentication_test.ts    |  15 +-
 .../decryptedAttachmentsManager_test.ts       |   4 +-
 .../libsession_wrapper_contacts_test.ts       |   3 -
 .../libsession_wrapper_test.ts                |   4 +-
 .../libsession_wrapper_usergroups_test.ts     |   3 -
 .../session/unit/messages/ChatMessage_test.ts |  22 +-
 .../messages/ConfigurationMessage_test.ts     |   1 -
 .../messages/MessageRequestResponse_test.ts   |   2 -
 .../unit/messages/ReceiptMessage_test.ts      |   2 +-
 .../unit/messages/TypingMessage_test.ts       |   2 +-
 .../unit/models/ConversationModels_test.ts    |   3 -
 .../models/formatRowOfConversation_test.ts    |   3 -
 ts/test/session/unit/onion/GuardNodes_test.ts |   9 +-
 .../session/unit/onion/OnionErrors_test.ts    |  29 +-
 ts/test/session/unit/onion/OnionPaths_test.ts |   7 +-
 .../session/unit/onion/SeedNodeAPI_test.ts    |   8 +-
 .../session/unit/onion/SnodeNamespace_test.ts |   1 -
 .../unit/onion/SnodePoolUpdate_test.ts        |   8 +-
 ts/test/session/unit/onion/hfHandling_test.ts |   2 -
 ts/test/session/unit/padding/Padding_test.ts  |   8 +-
 ts/test/session/unit/privacy/Privacy_test.ts  |   3 +-
 .../unit/reactions/ReactionMessage_test.ts    |  12 +-
 .../receiver/opengroup/deduplicate_test.ts    |   3 -
 .../receiving/ConfigurationMessage_test.ts    |   8 +-
 .../unit/selectors/conversations_test.ts      |   2 -
 .../session/unit/sending/MessageQueue_test.ts |  15 +-
 .../unit/sending/MessageSender_test.ts        |   2 -
 .../unit/sending/PendingMessageCache_test.ts  |   6 +-
 ts/test/session/unit/sogsv3/ApiUtil_test.ts   |   3 +-
 .../unit/sogsv3/FetchCapabilities_test.ts     |   3 -
 .../session/unit/sogsv3/MutationCache_test.ts |   4 +-
 .../unit/sogsv3/knownBlindedKeys_test.ts      |   4 +-
 .../unit/swarm_polling/SwarmPolling_test.ts   |   5 -
 ts/test/session/unit/updater/updater_test.ts  |   1 -
 ts/test/session/unit/utils/JobQueue_test.ts   |   5 +-
 ts/test/session/unit/utils/Messages_test.ts   |  19 +-
 .../session/unit/utils/OpenGroupUtils_test.ts |   4 +-
 ts/test/session/unit/utils/Promise_test.ts    |  10 +-
 ts/test/session/unit/utils/RingBuffer_test.ts |   2 -
 ts/test/session/unit/utils/String_test.ts     |  32 +-
 .../unit/utils/TaskWithTimeout_test.ts        |   8 +-
 .../unit/utils/job_runner/JobRunner_test.ts   |  22 +-
 .../stubs/sending/PendingMessageCacheStub.ts  |   5 +-
 ts/test/test-utils/utils/envelope.ts          |   5 +-
 ts/test/test-utils/utils/message.ts           |   3 +-
 ts/test/test-utils/utils/pubkey.ts            |   2 -
 ts/test/test-utils/utils/stubbing.ts          |   9 +-
 ts/test/test-utils/utils/timeout.ts           |   5 +-
 ts/test/tslint.json                           |  12 -
 ts/test/types/Attachment_test.ts              |   1 -
 ts/test/types/Settings_test.ts                |   3 +-
 .../initializeAttachmentMetadata_test.ts      |  52 +-
 ts/test/util/blockedNumberController_test.ts  |   9 +-
 ts/themes/SessionTheme.tsx                    |   2 +-
 ts/themes/constants/colors.tsx                |   1 -
 ts/themes/globals.tsx                         |   1 +
 ts/themes/oceanDark.ts                        |   1 -
 ts/themes/oceanLight.ts                       |   1 -
 ts/themes/variableColors.tsx                  |   5 +-
 ts/types/Attachment.ts                        |   9 +-
 ts/types/MessageAttachment.ts                 |   2 -
 ts/types/attachments/VisualAttachment.ts      |  68 ++-
 ts/types/attachments/migrations.ts            |  21 +-
 .../message/initializeAttachmentMetadata.ts   |   2 +-
 ts/types/sqlSharedTypes.ts                    |   8 +-
 ts/updater/index.ts                           |   4 +-
 ts/updater/updater.ts                         |  16 +-
 ts/util/abbreviateNumber.ts                   |   4 +-
 ts/util/accountManager.ts                     |   6 +-
 ts/util/attachmentsUtil.ts                    |  21 +-
 ts/util/attachments_files.ts                  |   4 -
 ts/util/blockedNumberController.ts            |   2 +-
 ts/util/crypto/attachmentsEncrypter.ts        |  23 +-
 ts/util/crypto/profileEncrypter.ts            |   3 +-
 ts/util/emoji.ts                              |  16 +-
 ts/util/expiringMessages.ts                   |   8 +-
 ts/util/i18n.ts                               |   8 +-
 ts/util/index.ts                              |  10 +-
 ts/util/linkPreviewFetch.ts                   |   1 -
 ts/util/linkPreviews.ts                       |   1 +
 ts/util/makeLookup.ts                         |   9 -
 ts/util/notifications.ts                      |   1 -
 ts/util/privacy.ts                            |   1 -
 ts/util/reactions.ts                          |  39 +-
 ts/util/readReceipts.ts                       |   1 -
 ts/util/releaseFeature.ts                     |   2 +
 ts/util/saveQRCode.ts                         |   1 -
 ts/util/storage.ts                            |   7 +-
 ts/webworker/worker_interface.ts              |   3 +-
 .../browser/libsession_worker_interface.ts    |  10 +-
 .../workers/browser/util_worker_interface.ts  |   2 +-
 ts/webworker/workers/index.ts                 |   1 +
 .../node/libsession/libsession.worker.ts      |   6 +-
 ts/webworker/workers/node/util/util.worker.ts |  10 +-
 ts/window.d.ts                                |   9 +-
 tslint.json                                   |  99 ---
 utils.worker.config.js                        |   1 +
 yarn.lock                                     | 571 +++++++++++++-----
 406 files changed, 2437 insertions(+), 2466 deletions(-)
 delete mode 100644 ts/components/dialog/SessionModal.tsx
 delete mode 100644 ts/session/tslint.json
 delete mode 100644 ts/test/automation/tslint.json
 delete mode 100644 ts/test/tslint.json
 delete mode 100644 ts/util/makeLookup.ts
 delete mode 100644 tslint.json

diff --git a/.eslintignore b/.eslintignore
index 34c660b798..23d7f95896 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -1,5 +1,4 @@
 build/**
-components/**
 dist/**
 mnemonic_languages/**
 
@@ -13,3 +12,5 @@ ts/**/*.js
 playwright.config.js
 preload.js
 stylesheets/dist/
+compiled.d.ts
+.eslintrc.js
\ No newline at end of file
diff --git a/.eslintrc.js b/.eslintrc.js
index a01420ef15..27afc3b430 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -1,13 +1,23 @@
-// For reference: https://github.com/airbnb/javascript
-
 module.exports = {
+  root: true,
   settings: {
     'import/core-modules': ['electron'],
+    react: {
+      version: 'detect',
+    },
   },
 
-  extends: ['airbnb-base', 'prettier'],
+  extends: [
+    'airbnb-base',
+    'prettier',
+    'plugin:@typescript-eslint/recommended',
+    'plugin:react/recommended',
+    'plugin:react-hooks/recommended',
+  ],
 
-  plugins: ['mocha', 'more'],
+  plugins: ['mocha', 'more', '@typescript-eslint'],
+  parser: '@typescript-eslint/parser',
+  parserOptions: { project: ['tsconfig.json'] },
 
   rules: {
     'comma-dangle': [
@@ -47,10 +57,38 @@ module.exports = {
     'linebreak-style': ['error', 'unix'],
 
     quotes: ['error', 'single', { avoidEscape: true, allowTemplateLiterals: true }],
+    '@typescript-eslint/no-floating-promises': ['error'],
+    '@typescript-eslint/await-thenable': 'error',
+    '@typescript-eslint/array-type': ['error', { default: 'generic' }],
+    '@typescript-eslint/no-misused-promises': 'error',
 
     // Prettier overrides:
     'arrow-parens': 'off',
+    'no-nested-ternary': 'off',
     'function-paren-newline': 'off',
+
+    'import/prefer-default-export': 'off',
+    'operator-linebreak': 'off',
+    'prefer-destructuring': 'off',
+    'max-classes-per-file': 'off',
+    'lines-between-class-members': 'off',
+    '@typescript-eslint/no-explicit-any': 'off', // to reenable later
+    'arrow-body-style': 'off',
+    'no-plusplus': 'off',
+    'no-continue': 'off',
+    'no-void': 'off',
+    'default-param-last': 'off',
+
+    'no-shadow': 'off',
+    '@typescript-eslint/no-shadow': 'error',
+    'class-methods-use-this': 'off',
+    camelcase: 'off',
+
+    'no-unused-vars': 'off',
+    '@typescript-eslint/no-unused-vars': ['error', { argsIgnorePattern: '^_' }],
+    // 'no-unused-expressions': 'off',
+    // '@typescript-eslint/no-unused-expressions': 'error',
+
     'max-len': [
       'error',
       {
@@ -59,10 +97,28 @@ module.exports = {
         // high value as a buffer to let Prettier control the line length:
         code: 999,
         // We still want to limit comments as before:
-        comments: 150,
+        comments: 200,
         ignoreUrls: true,
         ignoreRegExpLiterals: true,
       },
     ],
   },
+  overrides: [
+    {
+      files: ['*_test.ts'],
+      rules: {
+        'no-unused-expressions': 'off',
+        'no-await-in-loop': 'off',
+        'no-empty': 'off',
+      },
+    },
+    {
+      files: ['ts/state/ducks/*.tsx', 'ts/state/ducks/*.ts'],
+      rules: { 'no-param-reassign': ['error', { props: false }] },
+    },
+    {
+      files: ['ts/node/**/*.ts', 'ts/test/**/*.ts'],
+      rules: { 'no-console': 'off' },
+    },
+  ],
 };
diff --git a/about_preload.js b/about_preload.js
index 6c72bee6d0..27f48d231e 100644
--- a/about_preload.js
+++ b/about_preload.js
@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-var-requires */
 /* global window */
 
 const { ipcRenderer } = require('electron');
diff --git a/debug_log_preload.js b/debug_log_preload.js
index 9321a01a9a..d5af17afe3 100644
--- a/debug_log_preload.js
+++ b/debug_log_preload.js
@@ -1,4 +1,5 @@
 /* global window */
+/* eslint-disable @typescript-eslint/no-var-requires */
 
 const { ipcRenderer } = require('electron');
 const url = require('url');
diff --git a/libsession.worker.config.js b/libsession.worker.config.js
index 44f78c29d7..fe1741bea8 100644
--- a/libsession.worker.config.js
+++ b/libsession.worker.config.js
@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-var-requires */
 const path = require('path');
 
 module.exports = {
diff --git a/package.json b/package.json
index b548351496..40cae5167d 100644
--- a/package.json
+++ b/package.json
@@ -43,7 +43,7 @@
     "protobuf": "pbjs --target static-module --wrap commonjs --out ts/protobuf/compiled.js protos/*.proto && pbts --out ts/protobuf/compiled.d.ts ts/protobuf/compiled.js --force-long",
     "sass": "rimraf 'stylesheets/dist/' && webpack  --config=./sass.config.js",
     "clean": "rimraf 'ts/**/*.js' 'ts/*.js' 'ts/*.js.map' 'ts/**/*.js.map' && rimraf tsconfig.tsbuildinfo;",
-    "lint-full": "yarn format-full && eslint . && tslint --format stylish --project .",
+    "lint-full": "yarn format-full && eslint .",
     "format-full": "prettier --list-different --write \"*.{css,js,json,scss,ts,tsx}\" \"./**/*.{css,js,json,scss,ts,tsx}\"",
     "integration-test": "npx playwright test",
     "start-prod-test": "cross-env NODE_ENV=production NODE_APP_INSTANCE=$MULTI electron .",
@@ -178,6 +178,8 @@
     "@types/sinon": "9.0.4",
     "@types/styled-components": "^5.1.4",
     "@types/uuid": "8.3.4",
+    "@typescript-eslint/eslint-plugin": "^6.1.0",
+    "@typescript-eslint/parser": "^6.1.0",
     "asar": "3.1.0",
     "buffer": "^6.0.3",
     "chai": "^4.3.4",
@@ -191,12 +193,14 @@
     "electron": "25.3.0",
     "electron-builder": "23.0.8",
     "esbuild": "^0.14.29",
-    "eslint": "^8.15.0",
+    "eslint": "^8.45.0",
     "eslint-config-airbnb-base": "^15.0.0",
     "eslint-config-prettier": "^8.8.0",
     "eslint-plugin-import": "^2.27.5",
     "eslint-plugin-mocha": "^10.1.0",
     "eslint-plugin-more": "^1.0.5",
+    "eslint-plugin-react": "^7.33.0",
+    "eslint-plugin-react-hooks": "^4.6.0",
     "events": "^3.3.0",
     "jsdom": "^19.0.0",
     "jsdom-global": "^3.0.2",
@@ -219,10 +223,7 @@
     "style-loader": "^3.3.1",
     "ts-loader": "^9.4.2",
     "ts-mock-imports": "^1.3.0",
-    "tslint": "5.19.0",
-    "tslint-microsoft-contrib": "6.0.0",
-    "tslint-react": "3.6.0",
-    "typescript": "^4.6.3",
+    "typescript": "^5.1.6",
     "webpack": "^5.76.3",
     "webpack-cli": "^5.0.1"
   },
diff --git a/password_preload.js b/password_preload.js
index 7463ad9b0a..ed8262bc39 100644
--- a/password_preload.js
+++ b/password_preload.js
@@ -1,4 +1,5 @@
 /* global window */
+/* eslint-disable @typescript-eslint/no-var-requires */
 
 const { ipcRenderer } = require('electron');
 const url = require('url');
diff --git a/playwright.config.ts b/playwright.config.ts
index dd2a231dd4..e5f200855e 100644
--- a/playwright.config.ts
+++ b/playwright.config.ts
@@ -1,4 +1,5 @@
-// tslint:disable-next-line: no-implicit-dependencies
+/* eslint-disable import/no-extraneous-dependencies */
+/* eslint-disable import/no-import-module-exports */
 import { PlaywrightTestConfig } from '@playwright/test';
 import { toNumber } from 'lodash';
 
diff --git a/preload.js b/preload.js
index 37d5765e0d..3ddc14cc43 100644
--- a/preload.js
+++ b/preload.js
@@ -1,3 +1,4 @@
+// eslint:disable: no-require-imports no-var-requires
 const { clipboard, ipcRenderer, webFrame } = require('electron/main');
 const { Storage } = require('./ts/util/storage');
 
@@ -15,7 +16,6 @@ if (config.environment !== 'production') {
 if (config.appInstance) {
   title += ` - ${config.appInstance}`;
 }
-// tslint:disable: no-require-imports no-var-requires
 
 window.platform = process.platform;
 window.getTitle = () => title;
@@ -240,7 +240,6 @@ const { getConversationController } = require('./ts/session/conversations/Conver
 window.getConversationController = getConversationController;
 // Linux seems to periodically let the event loop stop, so this is a global workaround
 setInterval(() => {
-  // tslint:disable-next-line: no-empty
   window.nodeSetImmediate(() => {});
 }, 1000);
 
diff --git a/sass.config.js b/sass.config.js
index 9c689eb4ed..ff48bd5ec5 100644
--- a/sass.config.js
+++ b/sass.config.js
@@ -1,9 +1,9 @@
+/* eslint-disable @typescript-eslint/no-var-requires */
+/* eslint-disable import/no-extraneous-dependencies */
 const path = require('path');
 
-// eslint-disable-next-line import/no-extraneous-dependencies
 const sass = require('sass'); // Prefer `dart-sass`
 
-// eslint-disable-next-line import/no-extraneous-dependencies
 const MiniCssExtractPlugin = require('mini-css-extract-plugin');
 
 module.exports = {
diff --git a/ts/components/AboutView.tsx b/ts/components/AboutView.tsx
index bea3ff915b..abffacdd11 100644
--- a/ts/components/AboutView.tsx
+++ b/ts/components/AboutView.tsx
@@ -40,7 +40,7 @@ export const AboutView = () => {
         theme: window.theme,
       });
     }
-  }, [window.theme]);
+  }, []);
 
   return (
     <SessionTheme>
diff --git a/ts/components/CaptionEditor.tsx b/ts/components/CaptionEditor.tsx
index e3ea2b0bf3..20e51b2cef 100644
--- a/ts/components/CaptionEditor.tsx
+++ b/ts/components/CaptionEditor.tsx
@@ -1,5 +1,3 @@
-// tslint:disable:react-a11y-anchors
-
 import React from 'react';
 import * as GoogleChrome from '../util/GoogleChrome';
 
diff --git a/ts/components/DebugLogView.tsx b/ts/components/DebugLogView.tsx
index ee8a87317f..3caa50b485 100644
--- a/ts/components/DebugLogView.tsx
+++ b/ts/components/DebugLogView.tsx
@@ -48,7 +48,6 @@ const StyledContent = styled.div`
 `;
 
 const DebugLogTextArea = (props: { content: string }) => {
-  // tslint:disable-next-line: react-a11y-input-elements
   return <textarea spellCheck="false" rows={10} value={props.content} style={{ height: '100%' }} />;
 };
 
@@ -69,7 +68,6 @@ const DebugLogButtons = (props: { content: string }) => {
     </div>
   );
 };
-// tslint:disable: no-console
 
 const DebugLogViewAndSave = () => {
   const [content, setContent] = useState(window.i18n('loading'));
@@ -85,6 +83,7 @@ const DebugLogViewAndSave = () => {
         const debugLogWithSystemInfo = `${operatingSystemInfo} ${commitHashInfo} ${text}`;
         setContent(debugLogWithSystemInfo);
       })
+      // eslint-disable-next-line no-console
       .catch(console.error);
   }, []);
 
@@ -103,7 +102,7 @@ export const DebugLogView = () => {
         theme: window.theme,
       });
     }
-  }, [window.theme]);
+  }, []);
 
   return (
     <SessionTheme>
diff --git a/ts/components/MemberListItem.tsx b/ts/components/MemberListItem.tsx
index d7c7aa6ee0..cda20a20bb 100644
--- a/ts/components/MemberListItem.tsx
+++ b/ts/components/MemberListItem.tsx
@@ -1,7 +1,8 @@
 import React from 'react';
+import styled from 'styled-components';
+
 import { Avatar, AvatarSize, CrownIcon } from './avatar/Avatar';
 import { useConversationUsernameOrShorten } from '../hooks/useParamSelector';
-import styled from 'styled-components';
 import { SessionRadio } from './basic/SessionRadio';
 
 const AvatarContainer = styled.div`
@@ -93,9 +94,9 @@ export const MemberListItem = (props: {
   const memberName = useConversationUsernameOrShorten(pubkey);
 
   return (
-    // tslint:disable-next-line: use-simple-attributes
     <StyledSessionMemberItem
       onClick={() => {
+        // eslint-disable-next-line no-unused-expressions
         isSelected ? onUnselect?.(pubkey) : onSelect?.(pubkey);
       }}
       style={
diff --git a/ts/components/SessionInboxView.tsx b/ts/components/SessionInboxView.tsx
index e357ba7bf8..fe3ced5502 100644
--- a/ts/components/SessionInboxView.tsx
+++ b/ts/components/SessionInboxView.tsx
@@ -1,10 +1,15 @@
-import React, { useEffect } from 'react';
+import moment from 'moment';
+import React from 'react';
 import { Provider } from 'react-redux';
-import { LeftPane } from './leftpane/LeftPane';
-
-// tslint:disable-next-line: no-submodule-imports
+import styled from 'styled-components';
+import { fromPairs, map } from 'lodash';
 import { persistStore } from 'redux-persist';
 import { PersistGate } from 'redux-persist/integration/react';
+import useUpdate from 'react-use/lib/useUpdate';
+import useMount from 'react-use/lib/useMount';
+
+import { LeftPane } from './leftpane/LeftPane';
+// moment does not support es-419 correctly (and cause white screen on app start)
 import { getConversationController } from '../session/conversations';
 import { UserUtils } from '../session/utils';
 import { createStore } from '../state/createStore';
@@ -24,15 +29,23 @@ import { initialThemeState } from '../state/ducks/theme';
 import { TimerOptionsArray } from '../state/ducks/timerOptions';
 import { initialUserConfigState } from '../state/ducks/userConfig';
 import { StateType } from '../state/reducer';
-import { makeLookup } from '../util';
 import { ExpirationTimerOptions } from '../util/expiringMessages';
 import { SessionMainPanel } from './SessionMainPanel';
 
-// moment does not support es-419 correctly (and cause white screen on app start)
-import moment from 'moment';
-import styled from 'styled-components';
+import { SettingsKey } from '../data/settings-key';
+import { getSettingsInitialState, updateAllOnStorageReady } from '../state/ducks/settings';
 import { initialSogsRoomInfoState } from '../state/ducks/sogsRoomInfo';
+import { useHasDeviceOutdatedSyncing } from '../state/selectors/settings';
 import { Storage } from '../util/storage';
+import { NoticeBanner } from './NoticeBanner';
+import { Flex } from './basic/Flex';
+
+function makeLookup<T>(items: Array<T>, key: string): { [key: string]: T } {
+  // Yep, we can't index into item without knowing what it is. True. But we want to.
+  const pairs = map(items, item => [(item as any)[key] as string, item]);
+
+  return fromPairs(pairs);
+}
 
 // Default to the locale from env. It will be overridden if moment
 // does not recognize it with what moment knows which is the closest.
@@ -40,15 +53,6 @@ import { Storage } from '../util/storage';
 // We just need to use what we got from moment in getLocale on the updateLocale below
 moment.locale((window.i18n as any).getLocale());
 
-// Workaround: A react component's required properties are filtering up through connect()
-//   https://github.com/DefinitelyTyped/DefinitelyTyped/issues/31363
-import useUpdate from 'react-use/lib/useUpdate';
-import { SettingsKey } from '../data/settings-key';
-import { NoticeBanner } from './NoticeBanner';
-import { Flex } from './basic/Flex';
-import { useHasDeviceOutdatedSyncing } from '../state/selectors/settings';
-import { getSettingsInitialState, updateAllOnStorageReady } from '../state/ducks/settings';
-
 const StyledGutter = styled.div`
   width: 380px !important;
   transition: none;
@@ -99,8 +103,8 @@ function setupLeftPane(forceUpdateInboxComponent: () => void) {
 const SomeDeviceOutdatedSyncingNotice = () => {
   const outdatedBannerShouldBeShown = useHasDeviceOutdatedSyncing();
 
-  const dismiss = async () => {
-    await Storage.put(SettingsKey.someDeviceOutdatedSyncing, false);
+  const dismiss = () => {
+    void Storage.put(SettingsKey.someDeviceOutdatedSyncing, false);
   };
 
   if (!outdatedBannerShouldBeShown) {
@@ -117,9 +121,9 @@ const SomeDeviceOutdatedSyncingNotice = () => {
 export const SessionInboxView = () => {
   const update = useUpdate();
   // run only on mount
-  useEffect(() => {
+  useMount(() => {
     setupLeftPane(update);
-  }, []);
+  });
 
   if (!window.inboxStore) {
     return null;
diff --git a/ts/components/SessionPasswordPrompt.tsx b/ts/components/SessionPasswordPrompt.tsx
index fb590f15c0..055fc9aeb6 100644
--- a/ts/components/SessionPasswordPrompt.tsx
+++ b/ts/components/SessionPasswordPrompt.tsx
@@ -1,14 +1,14 @@
 import React, { useEffect } from 'react';
 import classNames from 'classnames';
-
+import styled from 'styled-components';
 import autoBind from 'auto-bind';
+import { isString } from 'lodash';
+
 import { SessionButton, SessionButtonColor, SessionButtonType } from './basic/SessionButton';
 import { SessionSpinner } from './basic/SessionSpinner';
 import { SessionTheme } from '../themes/SessionTheme';
 import { switchThemeTo } from '../themes/switchTheme';
-import styled from 'styled-components';
 import { ToastUtils } from '../session/utils';
-import { isString } from 'lodash';
 import { SessionToastContainer } from './SessionToastContainer';
 import { SessionWrapperModal } from './SessionWrapperModal';
 import { switchPrimaryColorTo } from '../themes/switchPrimaryColor';
@@ -20,7 +20,6 @@ interface State {
 }
 
 export const MAX_LOGIN_TRIES = 3;
-// tslint:disable: use-simple-attributes
 
 const TextPleaseWait = (props: { isLoading: boolean }) => {
   if (!props.isLoading) {
@@ -35,7 +34,7 @@ const StyledContent = styled.div`
   width: 100%;
 `;
 
-class SessionPasswordPromptInner extends React.PureComponent<{}, State> {
+class SessionPasswordPromptInner extends React.PureComponent<unknown, State> {
   private inputRef?: any;
 
   constructor(props: any) {
@@ -135,7 +134,9 @@ class SessionPasswordPromptInner extends React.PureComponent<{}, State> {
 
     // this is to make sure a render has the time to happen before we lock the thread with all of the db work
     // this might be removed once we get the db operations to a worker thread
-    global.setTimeout(() => this.onLogin(passPhrase), 100);
+    global.setTimeout(() => {
+      void this.onLogin(passPhrase);
+    }, 100);
   }
 
   private initClearDataView() {
@@ -203,7 +204,7 @@ export const SessionPasswordPrompt = () => {
     if (window.primaryColor) {
       void switchPrimaryColorTo(window.primaryColor);
     }
-  }, [window.theme, window.primaryColor]);
+  }, []);
 
   return (
     <SessionTheme>
diff --git a/ts/components/SessionToastContainer.tsx b/ts/components/SessionToastContainer.tsx
index 260f787dea..3176237c56 100644
--- a/ts/components/SessionToastContainer.tsx
+++ b/ts/components/SessionToastContainer.tsx
@@ -29,7 +29,6 @@ const SessionToastContainerPrivate = () => {
   );
 };
 
-// tslint:disable-next-line: no-default-export
 export const SessionToastContainer = styled(SessionToastContainerPrivate).attrs({
   // custom props
 })`
diff --git a/ts/components/SessionWrapperModal.tsx b/ts/components/SessionWrapperModal.tsx
index 36a53ad8ea..c75a64c0df 100644
--- a/ts/components/SessionWrapperModal.tsx
+++ b/ts/components/SessionWrapperModal.tsx
@@ -1,10 +1,9 @@
 import React, { useRef } from 'react';
 import classNames from 'classnames';
+import useKey from 'react-use/lib/useKey';
 
-import { SessionIconButton } from './icon/';
+import { SessionIconButton } from './icon';
 
-// tslint:disable-next-line: no-submodule-imports
-import useKey from 'react-use/lib/useKey';
 import { SessionButton, SessionButtonColor, SessionButtonType } from './basic/SessionButton';
 
 export type SessionWrapperModalType = {
@@ -65,7 +64,7 @@ export const SessionWrapperModal = (props: SessionWrapperModalType) => {
 
   return (
     <div
-      className={classNames('loki-dialog modal', additionalClassName ? additionalClassName : null)}
+      className={classNames('loki-dialog modal', additionalClassName || null)}
       onClick={handleClick}
       role="dialog"
     >
diff --git a/ts/components/SplitViewContainer.tsx b/ts/components/SplitViewContainer.tsx
index 6ba7a7041a..c1a001b8fc 100644
--- a/ts/components/SplitViewContainer.tsx
+++ b/ts/components/SplitViewContainer.tsx
@@ -52,7 +52,7 @@ const TopSplitViewPanel = ({
   React.useEffect(() => {
     if (topRef.current) {
       if (!topHeight) {
-        setTopHeight(Math.max(MIN_HEIGHT_TOP, topRef.current?.clientHeight / 2));
+        setTopHeight(Math.max(MIN_HEIGHT_TOP, (topRef.current?.clientHeight || 0) / 2));
         return;
       }
 
diff --git a/ts/components/avatar/Avatar.tsx b/ts/components/avatar/Avatar.tsx
index c5f1a7dfff..de2558b25a 100644
--- a/ts/components/avatar/Avatar.tsx
+++ b/ts/components/avatar/Avatar.tsx
@@ -2,6 +2,8 @@ import classNames from 'classnames';
 import React, { useState } from 'react';
 import { useSelector } from 'react-redux';
 import styled from 'styled-components';
+import { isEqual } from 'lodash';
+
 import { useDisableDrag } from '../../hooks/useDisableDrag';
 import { useEncryptedFileFetch } from '../../hooks/useEncryptedFileFetch';
 import {
@@ -13,7 +15,6 @@ import { isMessageSelectionMode } from '../../state/selectors/conversations';
 import { SessionIcon } from '../icon';
 import { AvatarPlaceHolder } from './AvatarPlaceHolder/AvatarPlaceHolder';
 import { ClosedGroupAvatar } from './AvatarPlaceHolder/ClosedGroupAvatar';
-import { isEqual } from 'lodash';
 
 export enum AvatarSize {
   XS = 28,
@@ -99,7 +100,6 @@ const AvatarImage = (
   }
   const dataToDisplay = base64Data ? `data:image/jpeg;base64,${base64Data}` : avatarPath;
 
-  // tslint:disable: react-a11y-img-has-alt
   return (
     <img
       onError={handleImageError}
@@ -165,7 +165,6 @@ const AvatarInner = (props: Props) => {
       data-testid={dataTestId}
     >
       {hasImage ? (
-        // tslint:disable-next-line: use-simple-attributes
         <AvatarImage
           avatarPath={urlToLoad}
           base64Data={base64Data}
diff --git a/ts/components/avatar/AvatarPlaceHolder/AvatarPlaceHolder.tsx b/ts/components/avatar/AvatarPlaceHolder/AvatarPlaceHolder.tsx
index b38780c897..eec91e5da3 100644
--- a/ts/components/avatar/AvatarPlaceHolder/AvatarPlaceHolder.tsx
+++ b/ts/components/avatar/AvatarPlaceHolder/AvatarPlaceHolder.tsx
@@ -14,9 +14,8 @@ const sha512FromPubkeyOneAtAtime = async (pubkey: string) => {
   return allowOnlyOneAtATime(`sha512FromPubkey-${pubkey}`, async () => {
     const buf = await crypto.subtle.digest('SHA-512', new TextEncoder().encode(pubkey));
 
-    // tslint:disable: prefer-template restrict-plus-operands
     return Array.prototype.map
-      .call(new Uint8Array(buf), (x: any) => ('00' + x.toString(16)).slice(-2))
+      .call(new Uint8Array(buf), (x: any) => `00${x.toString(16)}`.slice(-2))
       .join('');
   });
 };
@@ -37,7 +36,7 @@ function useHashBasedOnPubkey(pubkey: string) {
     if (cachedHash) {
       setHash(cachedHash);
       setIsLoading(false);
-      return;
+      return undefined;
     }
     setIsLoading(true);
     let isInProgress = true;
@@ -48,9 +47,10 @@ function useHashBasedOnPubkey(pubkey: string) {
 
         setHash(undefined);
       }
-      return;
+      return undefined;
     }
 
+    // eslint-disable-next-line more/no-then
     void sha512FromPubkeyOneAtAtime(pubkey).then(sha => {
       if (isInProgress) {
         setIsLoading(false);
diff --git a/ts/components/avatar/AvatarPlaceHolder/ClosedGroupAvatar.tsx b/ts/components/avatar/AvatarPlaceHolder/ClosedGroupAvatar.tsx
index 0979b95283..0ad21d2931 100644
--- a/ts/components/avatar/AvatarPlaceHolder/ClosedGroupAvatar.tsx
+++ b/ts/components/avatar/AvatarPlaceHolder/ClosedGroupAvatar.tsx
@@ -1,7 +1,8 @@
 import React from 'react';
+import { isEmpty } from 'lodash';
+
 import { assertUnreachable } from '../../../types/sqlSharedTypes';
 import { Avatar, AvatarSize } from '../Avatar';
-import { isEmpty } from 'lodash';
 import { useIsClosedGroup, useSortedGroupMembers } from '../../../hooks/useParamSelector';
 import { UserUtils } from '../../../session/utils';
 
@@ -22,6 +23,7 @@ function getClosedGroupAvatarsSize(size: AvatarSize): AvatarSize {
       return AvatarSize.XL;
     default:
       assertUnreachable(size, `Invalid size request for closed group avatar "${size}"`);
+      return AvatarSize.XL; // just to make eslint happy
   }
 }
 
diff --git a/ts/components/basic/Flex.tsx b/ts/components/basic/Flex.tsx
index 18386c20c6..f1c50ca47a 100644
--- a/ts/components/basic/Flex.tsx
+++ b/ts/components/basic/Flex.tsx
@@ -5,7 +5,7 @@ export interface FlexProps {
   className?: string;
   container?: boolean;
   dataTestId?: string;
-  /****** Container Props ********/
+  // Container Props
   flexDirection?: 'row' | 'column';
   justifyContent?:
     | 'flex-start'
@@ -24,11 +24,11 @@ export interface FlexProps {
     | 'baseline'
     | 'initial'
     | 'inherit';
-  /****** Child Props ********/
+  // Child Props
   flexGrow?: number;
   flexShrink?: number;
   flexBasis?: number;
-  /****** Common Layout Props ********/
+  // Common Layout Props
   padding?: string;
   margin?: string;
   width?: string;
diff --git a/ts/components/basic/MessageBodyHighlight.tsx b/ts/components/basic/MessageBodyHighlight.tsx
index f4e02abf83..fdd7bd5e9f 100644
--- a/ts/components/basic/MessageBodyHighlight.tsx
+++ b/ts/components/basic/MessageBodyHighlight.tsx
@@ -85,7 +85,6 @@ export const MessageBodyHighlight = (props: { text: string; isGroup: boolean })
       </SnippetHighlight>
     );
 
-    // @ts-ignore
     last = FIND_BEGIN_END.lastIndex;
     match = FIND_BEGIN_END.exec(text);
   }
diff --git a/ts/components/basic/SessionHTMLRenderer.tsx b/ts/components/basic/SessionHTMLRenderer.tsx
index 225a907f94..7e5280a0b5 100644
--- a/ts/components/basic/SessionHTMLRenderer.tsx
+++ b/ts/components/basic/SessionHTMLRenderer.tsx
@@ -1,17 +1,14 @@
 import React from 'react';
 import DOMPurify from 'dompurify';
 
-interface ReceivedProps {
+type ReceivedProps = {
   html: string;
   tag?: string;
   key?: any;
   className?: string;
-}
-
-// Needed because of https://github.com/microsoft/tslint-microsoft-contrib/issues/339
-type Props = ReceivedProps;
+};
 
-export const SessionHtmlRenderer: React.SFC<Props> = ({ tag = 'div', key, html, className }) => {
+export const SessionHtmlRenderer = ({ tag = 'div', key, html, className }: ReceivedProps) => {
   const clean = DOMPurify.sanitize(html, {
     USE_PROFILES: { html: true },
     FORBID_ATTR: ['script'],
@@ -20,7 +17,7 @@ export const SessionHtmlRenderer: React.SFC<Props> = ({ tag = 'div', key, html,
   return React.createElement(tag, {
     key,
     className,
-    // tslint:disable-next-line: react-no-dangerous-html
+
     dangerouslySetInnerHTML: { __html: clean },
   });
 };
diff --git a/ts/components/basic/SessionIdEditable.tsx b/ts/components/basic/SessionIdEditable.tsx
index 7571ba419f..bbac3fb8e3 100644
--- a/ts/components/basic/SessionIdEditable.tsx
+++ b/ts/components/basic/SessionIdEditable.tsx
@@ -39,8 +39,8 @@ export const SessionIdEditable = (props: Props) => {
   function handleKeyDown(e: KeyboardEvent<HTMLTextAreaElement>) {
     if (editable && e.key === 'Enter') {
       e.preventDefault();
-      // tslint:disable-next-line: no-unused-expression
-      onPressEnter && onPressEnter();
+
+      onPressEnter?.();
     }
   }
 
diff --git a/ts/components/basic/SessionRadio.tsx b/ts/components/basic/SessionRadio.tsx
index 3bb1b66f47..d45fb66820 100644
--- a/ts/components/basic/SessionRadio.tsx
+++ b/ts/components/basic/SessionRadio.tsx
@@ -1,7 +1,6 @@
 import React, { ChangeEvent } from 'react';
 import styled from 'styled-components';
-import { Flex } from '../basic/Flex';
-// tslint:disable: react-unused-props-and-state
+import { Flex } from './Flex';
 
 type Props = {
   label: string;
@@ -27,7 +26,6 @@ const StyledInput = styled.input<{
     background: ${props => (props.selectedColor ? props.selectedColor : 'var(--primary-color)')};
   }
 `;
-// tslint:disable: use-simple-attributes
 
 const StyledLabel = styled.label<{
   filledSize: number;
diff --git a/ts/components/basic/SessionRadioGroup.tsx b/ts/components/basic/SessionRadioGroup.tsx
index a7259bab76..e07c0b19c8 100644
--- a/ts/components/basic/SessionRadioGroup.tsx
+++ b/ts/components/basic/SessionRadioGroup.tsx
@@ -1,10 +1,10 @@
-import React, { useEffect, useState } from 'react';
+import React, { useState } from 'react';
+import useMount from 'react-use/lib/useMount';
 import styled, { CSSProperties } from 'styled-components';
 
 import { SessionRadio } from './SessionRadio';
 
 interface Props {
-  // tslint:disable: react-unused-props-and-state
   initialItem: string;
   items: Array<{ value: string; label: string }>;
   group: string;
@@ -32,9 +32,9 @@ export const SessionRadioGroup = (props: Props) => {
   const { items, group, initialItem, style } = props;
   const [activeItem, setActiveItem] = useState('');
 
-  useEffect(() => {
+  useMount(() => {
     setActiveItem(initialItem);
-  }, []);
+  });
 
   return (
     <StyledFieldSet id={group} style={style}>
diff --git a/ts/components/basic/SessionToast.tsx b/ts/components/basic/SessionToast.tsx
index 3473697bd6..d1ae112591 100644
--- a/ts/components/basic/SessionToast.tsx
+++ b/ts/components/basic/SessionToast.tsx
@@ -1,9 +1,10 @@
+import { noop } from 'lodash';
 import React from 'react';
-
-import { Flex } from '../basic/Flex';
 import styled from 'styled-components';
+
+import { Flex } from './Flex';
+
 import { SessionIcon, SessionIconType } from '../icon';
-import { noop } from 'lodash';
 
 // NOTE We don't change the color strip on the left based on the type. 16/09/2022
 export enum SessionToastType {
@@ -45,12 +46,10 @@ const IconDiv = styled.div`
   margin: 0 var(--margins-xs);
 `;
 
-// tslint:disable: use-simple-attributes
-
 export const SessionToast = (props: Props) => {
   const { title, description, type, icon } = props;
 
-  const toastDesc = description ? description : '';
+  const toastDesc = description || '';
   const toastIconSize = toastDesc ? 'huge' : 'medium';
 
   // Set a custom icon or allow the theme to define the icon
@@ -77,7 +76,6 @@ export const SessionToast = (props: Props) => {
   const onToastClick = props?.onToastClick || noop;
 
   return (
-    // tslint:disable-next-line: use-simple-attributes
     <Flex
       container={true}
       alignItems="center"
diff --git a/ts/components/basic/SessionToggle.tsx b/ts/components/basic/SessionToggle.tsx
index d0922d7b00..bdbb9e8573 100644
--- a/ts/components/basic/SessionToggle.tsx
+++ b/ts/components/basic/SessionToggle.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
-import { updateConfirmModal } from '../../state/ducks/modalDialog';
 import { useDispatch } from 'react-redux';
 import styled from 'styled-components';
+import { updateConfirmModal } from '../../state/ducks/modalDialog';
 
 const StyledKnob = styled.div<{ active: boolean }>`
   position: absolute;
diff --git a/ts/components/button/MenuButton.tsx b/ts/components/button/MenuButton.tsx
index 2cff265326..07852d7d67 100644
--- a/ts/components/button/MenuButton.tsx
+++ b/ts/components/button/MenuButton.tsx
@@ -4,7 +4,6 @@ import styled from 'styled-components';
 import { resetOverlayMode, setOverlayMode } from '../../state/ducks/section';
 import { getOverlayMode } from '../../state/selectors/section';
 import { SessionIcon } from '../icon';
-// tslint:disable: use-simple-attributes
 
 const StyledMenuButton = styled.button`
   position: relative;
diff --git a/ts/components/calling/CallButtons.tsx b/ts/components/calling/CallButtons.tsx
index 32eedce9e5..acb84dae82 100644
--- a/ts/components/calling/CallButtons.tsx
+++ b/ts/components/calling/CallButtons.tsx
@@ -1,13 +1,14 @@
-import { SessionIconButton } from '../icon';
+import React, { useEffect, useState } from 'react';
 import { animation, contextMenu, Item, Menu } from 'react-contexify';
+import { useDispatch, useSelector } from 'react-redux';
+import styled from 'styled-components';
+
+import { CallManager, ToastUtils } from '../../session/utils';
 import { InputItem } from '../../session/utils/calling/CallManager';
 import { setFullScreenCall } from '../../state/ducks/call';
-import { CallManager, ToastUtils } from '../../session/utils';
-import React, { useEffect, useState } from 'react';
-import { useDispatch, useSelector } from 'react-redux';
 import { getHasOngoingCallWithPubkey } from '../../state/selectors/call';
+import { SessionIconButton } from '../icon';
 import { DropDownAndToggleButton } from '../icon/DropDownAndToggleButton';
-import styled from 'styled-components';
 import { SessionContextMenuContainer } from '../SessionContextMenuContainer';
 
 const VideoInputMenu = ({
@@ -281,7 +282,7 @@ export const HangUpButton = ({ isFullScreen }: { isFullScreen: boolean }) => {
         iconType="hangup"
         iconColor="var(--danger-color)"
         borderRadius="50%"
-        onClick={handleEndCall}
+        onClick={() => void handleEndCall()}
         margin="10px"
         dataTestId="end-call"
       />
diff --git a/ts/components/calling/CallInFullScreenContainer.tsx b/ts/components/calling/CallInFullScreenContainer.tsx
index 457376006c..952a88e34f 100644
--- a/ts/components/calling/CallInFullScreenContainer.tsx
+++ b/ts/components/calling/CallInFullScreenContainer.tsx
@@ -1,6 +1,6 @@
 import React, { useEffect } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
-// tslint:disable-next-line: no-submodule-imports
+
 import useKey from 'react-use/lib/useKey';
 import styled from 'styled-components';
 import { useVideoCallEventsListener } from '../../hooks/useVideoEventListener';
@@ -68,7 +68,7 @@ export const CallInFullScreenContainer = () => {
     if (remoteStreamVideoIsMuted) {
       dispatch(setFullScreenCall(false));
     }
-  }, [remoteStreamVideoIsMuted]);
+  }, [remoteStreamVideoIsMuted, dispatch]);
 
   if (!ongoingCallWithFocused || !hasOngoingCallFullScreen) {
     return null;
diff --git a/ts/components/calling/DraggableCallContainer.tsx b/ts/components/calling/DraggableCallContainer.tsx
index 67564682e4..d3a14e361b 100644
--- a/ts/components/calling/DraggableCallContainer.tsx
+++ b/ts/components/calling/DraggableCallContainer.tsx
@@ -76,14 +76,13 @@ export const DraggableCallContainer = () => {
   );
   const videoRefRemote = useRef<HTMLVideoElement>(null);
 
-  function onWindowResize() {
-    if (positionY + 50 > window.innerHeight || positionX + 50 > window.innerWidth) {
-      setPositionX(window.innerWidth / 2);
-      setPositionY(window.innerHeight / 2);
-    }
-  }
-
   useEffect(() => {
+    function onWindowResize() {
+      if (positionY + 50 > window.innerHeight || positionX + 50 > window.innerWidth) {
+        setPositionX(window.innerWidth / 2);
+        setPositionY(window.innerHeight / 2);
+      }
+    }
     window.addEventListener('resize', onWindowResize);
 
     return () => {
diff --git a/ts/components/calling/InConversationCallContainer.tsx b/ts/components/calling/InConversationCallContainer.tsx
index bd5cdf6303..dfedb85ae6 100644
--- a/ts/components/calling/InConversationCallContainer.tsx
+++ b/ts/components/calling/InConversationCallContainer.tsx
@@ -2,6 +2,8 @@ import { useSelector } from 'react-redux';
 import React, { useRef, useState } from 'react';
 
 import styled from 'styled-components';
+import useInterval from 'react-use/lib/useInterval';
+import moment from 'moment';
 import { CallManager, UserUtils } from '../../session/utils';
 import {
   getCallIsInFullScreen,
@@ -18,9 +20,7 @@ import { useVideoCallEventsListener } from '../../hooks/useVideoEventListener';
 import { useModuloWithTripleDots } from '../../hooks/useModuloWithTripleDots';
 import { CallWindowControls } from './CallButtons';
 import { DEVICE_DISABLED_DEVICE_ID } from '../../session/utils/calling/CallManager';
-// tslint:disable-next-line: no-submodule-imports
-import useInterval from 'react-use/lib/useInterval';
-import moment from 'moment';
+
 import { SessionSpinner } from '../basic/SessionSpinner';
 
 const VideoContainer = styled.div`
@@ -112,7 +112,6 @@ const DurationLabel = () => {
   const ms = callDuration * 1000;
   const d = moment.duration(ms);
 
-  // tslint:disable-next-line: restrict-plus-operands
   const dateString = Math.floor(d.asHours()) + moment.utc(ms).format(':mm:ss');
   return <StyledCenteredLabel>{dateString}</StyledCenteredLabel>;
 };
@@ -135,7 +134,6 @@ export const VideoLoadingSpinner = (props: { fullWidth: boolean }) => {
   );
 };
 
-// tslint:disable-next-line: max-func-body-length
 export const InConversationCallContainer = () => {
   const isInFullScreen = useSelector(getCallIsInFullScreen);
 
diff --git a/ts/components/calling/IncomingCallDialog.tsx b/ts/components/calling/IncomingCallDialog.tsx
index af0b0983bc..98dd119081 100644
--- a/ts/components/calling/IncomingCallDialog.tsx
+++ b/ts/components/calling/IncomingCallDialog.tsx
@@ -35,14 +35,14 @@ export const IncomingCallDialog = () => {
   useEffect(() => {
     let timeout: NodeJS.Timeout;
     if (incomingCallFromPubkey) {
-      timeout = global.setTimeout(async () => {
+      timeout = global.setTimeout(() => {
         if (incomingCallFromPubkey) {
           window.log.info(
             `call missed with ${ed25519Str(
               incomingCallFromPubkey
             )} as the dialog was not interacted with for ${callTimeoutMs} ms`
           );
-          await CallManager.USER_rejectIncomingCallRequest(incomingCallFromPubkey);
+          void CallManager.USER_rejectIncomingCallRequest(incomingCallFromPubkey);
         }
       }, callTimeoutMs);
     }
@@ -54,7 +54,7 @@ export const IncomingCallDialog = () => {
     };
   }, [incomingCallFromPubkey]);
 
-  //#region input handlers
+  // #region input handlers
   const handleAcceptIncomingCall = async () => {
     if (incomingCallFromPubkey) {
       await CallManager.USER_acceptIncomingCallRequest(incomingCallFromPubkey);
diff --git a/ts/components/conversation/AddMentions.tsx b/ts/components/conversation/AddMentions.tsx
index b9ba2e73e2..0246683267 100644
--- a/ts/components/conversation/AddMentions.tsx
+++ b/ts/components/conversation/AddMentions.tsx
@@ -1,9 +1,9 @@
+import React from 'react';
+import styled from 'styled-components';
 import { RenderTextCallbackType } from '../../types/Util';
 import { PubKey } from '../../session/types';
 import { getConversationController } from '../../session/conversations';
-import React from 'react';
 import { isUsAnySogsFromCache } from '../../session/apis/open_group_api/sogsv3/knownBlindedkeys';
-import styled from 'styled-components';
 
 interface MentionProps {
   key: string;
diff --git a/ts/components/conversation/ContactName.tsx b/ts/components/conversation/ContactName.tsx
index c5efb6e2d8..9801f2fe6a 100644
--- a/ts/components/conversation/ContactName.tsx
+++ b/ts/components/conversation/ContactName.tsx
@@ -9,14 +9,14 @@ type Props = {
   name?: string | null;
   profileName?: string | null;
   module?: string;
-  boldProfileName?: Boolean;
-  compact?: Boolean;
-  shouldShowPubkey: Boolean;
+  boldProfileName?: boolean;
+  compact?: boolean;
+  shouldShowPubkey: boolean;
 };
 
 export const ContactName = (props: Props) => {
   const { pubkey, name, profileName, module, boldProfileName, compact, shouldShowPubkey } = props;
-  const prefix = module ? module : 'module-contact-name';
+  const prefix = module || 'module-contact-name';
 
   const convoName = useConversationUsernameOrShorten(pubkey);
   const isPrivate = useIsPrivate(pubkey);
diff --git a/ts/components/conversation/ConversationHeader.tsx b/ts/components/conversation/ConversationHeader.tsx
index 15ee685a0d..9bc56ce25d 100644
--- a/ts/components/conversation/ConversationHeader.tsx
+++ b/ts/components/conversation/ConversationHeader.tsx
@@ -1,11 +1,11 @@
 import React from 'react';
 
-import { Avatar, AvatarSize } from '../avatar/Avatar';
-
 import { contextMenu } from 'react-contexify';
 import { useDispatch, useSelector } from 'react-redux';
 import styled from 'styled-components';
 import { ConversationNotificationSettingType } from '../../models/conversationAttributes';
+import { Avatar, AvatarSize } from '../avatar/Avatar';
+
 import {
   getSelectedMessageIds,
   isMessageDetailView,
diff --git a/ts/components/conversation/ExpireTimer.tsx b/ts/components/conversation/ExpireTimer.tsx
index ed5f894087..22bae551bf 100644
--- a/ts/components/conversation/ExpireTimer.tsx
+++ b/ts/components/conversation/ExpireTimer.tsx
@@ -1,10 +1,9 @@
 import React, { useCallback, useState } from 'react';
 
-import { getTimerBucketIcon } from '../../util/timer';
-
-// tslint:disable-next-line: no-submodule-imports
 import useInterval from 'react-use/lib/useInterval';
 import styled from 'styled-components';
+import { getTimerBucketIcon } from '../../util/timer';
+
 import { SessionIcon } from '../icon/SessionIcon';
 
 type Props = {
diff --git a/ts/components/conversation/H5AudioPlayer.tsx b/ts/components/conversation/H5AudioPlayer.tsx
index fa0151ae3e..717eb7652d 100644
--- a/ts/components/conversation/H5AudioPlayer.tsx
+++ b/ts/components/conversation/H5AudioPlayer.tsx
@@ -175,7 +175,7 @@ export const AudioPlayerWithEncryptedFile = (props: {
 
   useEffect(() => {
     if (messageId !== undefined && messageId === nextMessageToPlayId) {
-      player.current?.audio.current?.play();
+      void player.current?.audio.current?.play();
     }
   }, [messageId, nextMessageToPlayId, player]);
 
diff --git a/ts/components/conversation/Image.tsx b/ts/components/conversation/Image.tsx
index b7bc0622ff..44ecab4166 100644
--- a/ts/components/conversation/Image.tsx
+++ b/ts/components/conversation/Image.tsx
@@ -1,11 +1,11 @@
 import React, { useCallback } from 'react';
 import classNames from 'classnames';
+import styled from 'styled-components';
 
 import { Spinner } from '../basic/Spinner';
 import { AttachmentType, AttachmentTypeWithPath } from '../../types/Attachment';
 import { useEncryptedFileFetch } from '../../hooks/useEncryptedFileFetch';
 import { useDisableDrag } from '../../hooks/useDisableDrag';
-import styled from 'styled-components';
 
 type Props = {
   alt: string;
@@ -41,7 +41,6 @@ const StyledOverlay = styled.div<Pick<Props, 'darkOverlay' | 'softCorners'>>`
     props.darkOverlay ? 'var(--message-link-preview-background-color)' : 'unset'};
 `;
 export const Image = (props: Props) => {
-  // tslint:disable-next-line max-func-body-length cyclomatic-complexity
   const {
     alt,
     attachment,
@@ -64,7 +63,6 @@ export const Image = (props: Props) => {
     if (url && onError) {
       onError();
     }
-    return;
   }, [url, onError]);
   const disableDrag = useDisableDrag();
 
diff --git a/ts/components/conversation/ImageGrid.tsx b/ts/components/conversation/ImageGrid.tsx
index 24e87882b2..dc87a6a15e 100644
--- a/ts/components/conversation/ImageGrid.tsx
+++ b/ts/components/conversation/ImageGrid.tsx
@@ -1,4 +1,5 @@
 import React, { useContext } from 'react';
+import styled from 'styled-components';
 
 import {
   areAllAttachmentsVisual,
@@ -11,7 +12,6 @@ import {
 
 import { Image } from './Image';
 import { IsMessageVisibleContext } from './message/message-content/MessageContent';
-import styled from 'styled-components';
 import { THUMBNAIL_SIDE } from '../../types/attachments/VisualAttachment';
 
 type Props = {
@@ -26,7 +26,6 @@ const StyledImageGrid = styled.div<{ flexDirection: 'row' | 'column' }>`
   gap: var(--margins-sm);
   flex-direction: ${props => props.flexDirection};
 `;
-// tslint:disable: cyclomatic-complexity max-func-body-length use-simple-attributes
 
 const Row = (
   props: Props & { renderedSize: number; startIndex: number; totalAttachmentsCount: number }
diff --git a/ts/components/conversation/SessionConversation.tsx b/ts/components/conversation/SessionConversation.tsx
index e8db1d73aa..3f3d0446bb 100644
--- a/ts/components/conversation/SessionConversation.tsx
+++ b/ts/components/conversation/SessionConversation.tsx
@@ -2,8 +2,10 @@ import _ from 'lodash';
 import React from 'react';
 
 import autoBind from 'auto-bind';
+import { blobToArrayBuffer } from 'blob-util';
+import loadImage from 'blueimp-load-image';
 import classNames from 'classnames';
-
+import styled from 'styled-components';
 import {
   CompositionBox,
   SendMessageType,
@@ -12,14 +14,10 @@ import {
 
 import { perfEnd, perfStart } from '../../session/utils/Performance';
 
-const DEFAULT_JPEG_QUALITY = 0.85;
-
 import { SessionMessagesListContainer } from './SessionMessagesListContainer';
 
 import { SessionFileDropzone } from './SessionFileDropzone';
 
-import { blobToArrayBuffer } from 'blob-util';
-import loadImage from 'blueimp-load-image';
 import { Data } from '../../data/data';
 import { markAllReadByConvoId } from '../../interactions/conversationInteractions';
 import { MAX_ATTACHMENT_FILESIZE_BYTES } from '../../session/constants';
@@ -55,9 +53,9 @@ import { SessionRightPanelWithDetails } from './SessionRightPanel';
 import { NoMessageInConversation } from './SubtleNotification';
 import { MessageDetail } from './message/message-item/MessageDetail';
 
-import styled from 'styled-components';
 import { SessionSpinner } from '../basic/SessionSpinner';
-// tslint:disable: jsx-curly-spacing
+
+const DEFAULT_JPEG_QUALITY = 0.85;
 
 interface State {
   isDraggingFile: boolean;
@@ -289,6 +287,7 @@ export class SessionConversation extends React.Component<Props, State> {
               <CompositionBox
                 sendMessage={this.sendMessageFn}
                 stagedAttachments={this.props.stagedAttachments}
+                // eslint-disable-next-line @typescript-eslint/no-misused-promises
                 onChoseAttachments={this.onChoseAttachments}
               />
             </div>
@@ -360,13 +359,12 @@ export class SessionConversation extends React.Component<Props, State> {
       return;
     }
 
-    // tslint:disable-next-line: prefer-for-of
     for (let i = 0; i < attachmentsFileList.length; i++) {
+      // eslint-disable-next-line no-await-in-loop
       await this.maybeAddAttachment(attachmentsFileList[i]);
     }
   }
 
-  // tslint:disable: max-func-body-length cyclomatic-complexity
   private async maybeAddAttachment(file: any) {
     if (!file) {
       return;
diff --git a/ts/components/conversation/SessionEmojiPanel.tsx b/ts/components/conversation/SessionEmojiPanel.tsx
index 315776103e..11d0ac9e9d 100644
--- a/ts/components/conversation/SessionEmojiPanel.tsx
+++ b/ts/components/conversation/SessionEmojiPanel.tsx
@@ -1,7 +1,6 @@
 import React, { forwardRef } from 'react';
 import classNames from 'classnames';
 import styled from 'styled-components';
-// @ts-ignore
 import Picker from '@emoji-mart/react';
 import { useSelector } from 'react-redux';
 import { getTheme, isDarkTheme } from '../../state/selectors/theme';
@@ -12,6 +11,7 @@ import {
   PrimaryColorStateType,
   THEMES,
   ThemeStateType,
+  // eslint-disable-next-line import/extensions
 } from '../../themes/constants/colors.js';
 import { hexColorToRGB } from '../../util/hexColorToRGB';
 import { getPrimaryColor } from '../../state/selectors/primaryColor';
@@ -97,6 +97,7 @@ const pickerProps: FixedPickerProps = {
   skinTonePosition: 'preview',
 };
 
+// eslint-disable-next-line react/display-name
 export const SessionEmojiPanel = forwardRef<HTMLDivElement, Props>((props: Props, ref) => {
   const { onEmojiClicked, show, isModal = false, onKeyDown } = props;
   const primaryColor = useSelector(getPrimaryColor);
@@ -109,11 +110,10 @@ export const SessionEmojiPanel = forwardRef<HTMLDivElement, Props>((props: Props
   switch (theme) {
     case 'ocean-dark':
       panelBackgroundRGB = hexColorToRGB(THEMES.OCEAN_DARK.COLOR1);
-      // tslint:disable: no-non-null-assertion
+
       panelTextRGB = hexColorToRGB(THEMES.OCEAN_DARK.COLOR7!);
       break;
     case 'ocean-light':
-      // tslint:disable: no-non-null-assertion
       panelBackgroundRGB = hexColorToRGB(THEMES.OCEAN_LIGHT.COLOR7!);
       panelTextRGB = hexColorToRGB(THEMES.OCEAN_LIGHT.COLOR1);
       break;
diff --git a/ts/components/conversation/SessionMessagesList.tsx b/ts/components/conversation/SessionMessagesList.tsx
index 457c705d24..1b823f1005 100644
--- a/ts/components/conversation/SessionMessagesList.tsx
+++ b/ts/components/conversation/SessionMessagesList.tsx
@@ -1,6 +1,6 @@
 import React, { useLayoutEffect, useState } from 'react';
 import { useSelector } from 'react-redux';
-// tslint:disable-next-line: no-submodule-imports
+
 import useKey from 'react-use/lib/useKey';
 import {
   PropsForDataExtractionNotification,
diff --git a/ts/components/conversation/SessionMessagesListContainer.tsx b/ts/components/conversation/SessionMessagesListContainer.tsx
index 53401c1185..6fde12df26 100644
--- a/ts/components/conversation/SessionMessagesListContainer.tsx
+++ b/ts/components/conversation/SessionMessagesListContainer.tsx
@@ -1,7 +1,6 @@
 import React from 'react';
 
 import { contextMenu } from 'react-contexify';
-import { SessionScrollButton } from '../SessionScrollButton';
 
 import { connect } from 'react-redux';
 
@@ -14,6 +13,8 @@ import {
   resetOldTopMessageId,
   SortedMessageModelProps,
 } from '../../state/ducks/conversations';
+import { SessionScrollButton } from '../SessionScrollButton';
+
 import { StateType } from '../../state/reducer';
 import {
   getQuotedMessageToAnimate,
@@ -38,7 +39,6 @@ export type ScrollToLoadedReasons =
   | 'load-more-bottom';
 
 export const ScrollToLoadedMessageContext = React.createContext(
-  // tslint:disable-next-line: no-empty
   (_loadedMessageIdToScrollTo: string, _reason: ScrollToLoadedReasons) => {}
 );
 
@@ -51,7 +51,7 @@ type Props = SessionMessageListProps & {
   scrollToNow: () => Promise<void>;
 };
 
-const StyledMessagesContainer = styled.div<{}>`
+const StyledMessagesContainer = styled.div`
   display: flex;
   flex-grow: 1;
   gap: var(--margins-xxs);
@@ -144,7 +144,7 @@ class SessionMessagesListContainerInner extends React.Component<Props> {
         </ScrollToLoadedMessageContext.Provider>
 
         <SessionScrollButton
-          onClickScrollBottom={this.props.scrollToNow}
+          onClickScrollBottom={() => void this.props.scrollToNow()}
           key="scroll-down-button"
         />
       </StyledMessagesContainer>
@@ -250,7 +250,6 @@ class SessionMessagesListContainerInner extends React.Component<Props> {
       return;
     }
 
-    // tslint:disable-next-line: restrict-plus-operands
     messageContainer.scrollBy({
       top: Math.floor(+messageContainer.clientHeight * 2) / 3,
       behavior: 'smooth',
diff --git a/ts/components/conversation/SessionQuotedMessageComposition.tsx b/ts/components/conversation/SessionQuotedMessageComposition.tsx
index 1ed2366e03..6c54f5f78a 100644
--- a/ts/components/conversation/SessionQuotedMessageComposition.tsx
+++ b/ts/components/conversation/SessionQuotedMessageComposition.tsx
@@ -1,15 +1,16 @@
 import React from 'react';
-import { SessionIcon, SessionIconButton } from '../icon';
 import styled from 'styled-components';
 import { useDispatch, useSelector } from 'react-redux';
+import useKey from 'react-use/lib/useKey';
+import { SessionIcon, SessionIconButton } from '../icon';
+
 import { quoteMessage } from '../../state/ducks/conversations';
 import { getQuotedMessage } from '../../state/selectors/conversations';
 import { getAlt, isAudio } from '../../types/Attachment';
 import { AUDIO_MP3 } from '../../types/MIME';
 import { Flex } from '../basic/Flex';
-import { Image } from '../../../ts/components/conversation/Image';
-// tslint:disable-next-line: no-submodule-imports
-import useKey from 'react-use/lib/useKey';
+import { Image } from './Image';
+
 import { getAbsoluteAttachmentPath } from '../../types/MessageAttachment';
 import { GoogleChrome } from '../../util';
 import { findAndFormatContact } from '../../models/message';
diff --git a/ts/components/conversation/SessionRecording.tsx b/ts/components/conversation/SessionRecording.tsx
index cedc8d2cb9..d2f30b417e 100644
--- a/ts/components/conversation/SessionRecording.tsx
+++ b/ts/components/conversation/SessionRecording.tsx
@@ -1,11 +1,12 @@
+/* eslint-disable @typescript-eslint/no-misused-promises */
 import React from 'react';
 import classNames from 'classnames';
 import moment from 'moment';
 
-import { SessionIconButton } from '../icon';
 import autoBind from 'auto-bind';
 import MicRecorder from 'mic-recorder-to-mp3';
 import styled from 'styled-components';
+import { SessionIconButton } from '../icon';
 import { Constants } from '../../session';
 import { ToastUtils } from '../../session/utils';
 import { MAX_ATTACHMENT_FILESIZE_BYTES } from '../../session/constants';
@@ -88,7 +89,6 @@ export class SessionRecording extends React.Component<Props, State> {
     }
   }
 
-  // tslint:disable-next-line: cyclomatic-complexity
   public render() {
     const { isPlaying, isPaused, isRecording, startTimestamp, nowTimestamp } = this.state;
 
@@ -103,14 +103,12 @@ export class SessionRecording extends React.Component<Props, State> {
     // otherwise display 0
     const displayTimeMs = isRecording
       ? (nowTimestamp - startTimestamp) * 1000
-      : (this.audioElement &&
-          (this.audioElement?.currentTime * 1000 || this.audioElement?.duration)) ||
+      : (this.audioElement?.currentTime &&
+          (this.audioElement.currentTime * 1000 || this.audioElement?.duration)) ||
         0;
 
     const displayTimeString = moment.utc(displayTimeMs).format('m:ss');
-    const recordingDurationMs = this.audioElement?.duration
-      ? this.audioElement?.duration * 1000
-      : 1;
+    const recordingDurationMs = this.audioElement?.duration ? this.audioElement.duration * 1000 : 1;
 
     let remainingTimeString = '';
     if (recordingDurationMs !== undefined) {
@@ -287,6 +285,7 @@ export class SessionRecording extends React.Component<Props, State> {
     this.recorder = new MicRecorder({
       bitRate: 128,
     });
+    // eslint-disable-next-line more/no-then
     this.recorder
       .start()
       .then(() => {
@@ -304,6 +303,7 @@ export class SessionRecording extends React.Component<Props, State> {
     if (!this.recorder) {
       return;
     }
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
     const [_, blob] = await this.recorder.stop().getMp3();
     this.recorder = undefined;
 
diff --git a/ts/components/conversation/SessionRightPanel.tsx b/ts/components/conversation/SessionRightPanel.tsx
index f986326617..9bbb628def 100644
--- a/ts/components/conversation/SessionRightPanel.tsx
+++ b/ts/components/conversation/SessionRightPanel.tsx
@@ -1,11 +1,12 @@
-import _ from 'lodash';
+import { compact, flatten } from 'lodash';
 import React, { useEffect, useState } from 'react';
-import { SessionIconButton } from '../icon';
-// tslint:disable-next-line: no-submodule-imports
+
 import { useDispatch, useSelector } from 'react-redux';
 import useInterval from 'react-use/lib/useInterval';
 import styled from 'styled-components';
 import { Data } from '../../data/data';
+import { SessionIconButton } from '../icon';
+
 import {
   deleteAllMessagesByConvoIdWithConfirmation,
   setDisappearingMessagesByConvoId,
@@ -58,7 +59,7 @@ async function getMediaGalleryProps(
     Constants.CONVERSATION.DEFAULT_DOCUMENTS_FETCH_COUNT
   );
 
-  const media = _.flatten(
+  const media = flatten(
     rawMedia.map(attributes => {
       const { attachments, source, id, timestamp, serverTimestamp, received_at } = attributes;
 
@@ -110,7 +111,7 @@ async function getMediaGalleryProps(
 
   return {
     media,
-    documents: _.compact(documents), // remove null
+    documents: compact(documents), // remove null
   };
 }
 
@@ -201,8 +202,6 @@ const StyledName = styled.h4`
   font-size: var(--font-size-md);
 `;
 
-// tslint:disable: cyclomatic-complexity
-// tslint:disable: max-func-body-length
 export const SessionRightPanelWithDetails = () => {
   const [documents, setDocuments] = useState<Array<MediaItemType>>([]);
   const [media, setMedia] = useState<Array<MediaItemType>>([]);
@@ -224,22 +223,17 @@ export const SessionRightPanelWithDetails = () => {
     let isRunning = true;
 
     if (isShowing && selectedConvoKey) {
+      // eslint-disable-next-line more/no-then
       void getMediaGalleryProps(selectedConvoKey).then(results => {
         if (isRunning) {
-          if (!_.isEqual(documents, results.documents)) {
-            setDocuments(results.documents);
-          }
-
-          if (!_.isEqual(media, results.media)) {
-            setMedia(results.media);
-          }
+          setDocuments(results.documents);
+          setMedia(results.media);
         }
       });
     }
 
     return () => {
       isRunning = false;
-      return;
     };
   }, [isShowing, selectedConvoKey]);
 
@@ -253,10 +247,6 @@ export const SessionRightPanelWithDetails = () => {
     }
   }, 10000);
 
-  if (!selectedConvoKey) {
-    return null;
-  }
-
   const showMemberCount = !!(subscriberCount && subscriberCount > 0);
   const commonNoShow = isKickedFromGroup || left || isBlocked || !isActive;
   const hasDisappearingMessages = !isPublic && !commonNoShow;
@@ -270,6 +260,9 @@ export const SessionRightPanelWithDetails = () => {
 
   const timerOptions = useSelector(getTimerOptions).timerOptions;
 
+  if (!selectedConvoKey) {
+    return null;
+  }
   const disappearingMessagesOptions = timerOptions.map(option => {
     return {
       content: option.name,
@@ -308,8 +301,8 @@ export const SessionRightPanelWithDetails = () => {
         <StyledGroupSettingsItem
           className="group-settings-item"
           role="button"
-          onClick={async () => {
-            await showUpdateGroupNameByConvoId(selectedConvoKey);
+          onClick={() => {
+            void showUpdateGroupNameByConvoId(selectedConvoKey);
           }}
         >
           {isPublic ? window.i18n('editGroup') : window.i18n('editGroupName')}
@@ -342,8 +335,8 @@ export const SessionRightPanelWithDetails = () => {
         <StyledGroupSettingsItem
           className="group-settings-item"
           role="button"
-          onClick={async () => {
-            await showUpdateGroupMembersByConvoId(selectedConvoKey);
+          onClick={() => {
+            void showUpdateGroupMembersByConvoId(selectedConvoKey);
           }}
         >
           {window.i18n('groupMembers')}
@@ -360,7 +353,6 @@ export const SessionRightPanelWithDetails = () => {
 
       <MediaGallery documents={documents} media={media} />
       {isGroup && (
-        // tslint:disable-next-line: use-simple-attributes
         <StyledLeaveButton>
           <SessionButton
             text={leaveGroupString}
diff --git a/ts/components/conversation/SessionStagedLinkPreview.tsx b/ts/components/conversation/SessionStagedLinkPreview.tsx
index bae8cca3e2..fc9c8739ed 100644
--- a/ts/components/conversation/SessionStagedLinkPreview.tsx
+++ b/ts/components/conversation/SessionStagedLinkPreview.tsx
@@ -1,7 +1,9 @@
 import React from 'react';
-import { StagedLinkPreviewData } from './composition/CompositionBox';
+// eslint-disable-next-line import/no-named-default
 import { default as insecureNodeFetch } from 'node-fetch';
 import { AbortSignal } from 'abort-controller';
+import { StagedLinkPreviewData } from './composition/CompositionBox';
+
 import { arrayBufferFromFile } from '../../types/Attachment';
 import { AttachmentUtil, LinkPreviewUtil } from '../../util';
 import { fetchLinkPreviewImage } from '../../util/linkPreviewFetch';
@@ -52,7 +54,7 @@ export const getPreview = async (
 
   let image;
   if (imageHref && LinkPreviews.isLinkSafeToPreview(imageHref)) {
-    let objectUrl: void | string;
+    let objectUrl: undefined | string;
     try {
       window?.log?.info('insecureNodeFetch => plaintext for getPreview()');
 
diff --git a/ts/components/conversation/StagedLinkPreview.tsx b/ts/components/conversation/StagedLinkPreview.tsx
index 15f8e75fb1..bec1a2db98 100644
--- a/ts/components/conversation/StagedLinkPreview.tsx
+++ b/ts/components/conversation/StagedLinkPreview.tsx
@@ -1,4 +1,5 @@
 import React from 'react';
+import styled from 'styled-components';
 
 import { Image } from './Image';
 
@@ -6,7 +7,6 @@ import { SessionSpinner } from '../basic/SessionSpinner';
 import { StagedLinkPreviewImage } from './composition/CompositionBox';
 import { isImage } from '../../types/MIME';
 import { fromArrayBufferToBase64 } from '../../session/utils/String';
-import styled from 'styled-components';
 import { Flex } from '../basic/Flex';
 import { SessionIconButton } from '../icon';
 
diff --git a/ts/components/conversation/StagedPlaceholderAttachment.tsx b/ts/components/conversation/StagedPlaceholderAttachment.tsx
index 5d27736475..99b91ff06d 100644
--- a/ts/components/conversation/StagedPlaceholderAttachment.tsx
+++ b/ts/components/conversation/StagedPlaceholderAttachment.tsx
@@ -1,6 +1,5 @@
 import React, { MouseEvent } from 'react';
 import styled from 'styled-components';
-// tslint:disable: react-unused-props-and-state
 
 interface Props {
   onClick: (e: MouseEvent<HTMLDivElement>) => void;
diff --git a/ts/components/conversation/Timestamp.tsx b/ts/components/conversation/Timestamp.tsx
index 87967d1772..92c88f6063 100644
--- a/ts/components/conversation/Timestamp.tsx
+++ b/ts/components/conversation/Timestamp.tsx
@@ -1,7 +1,6 @@
 import React from 'react';
 import moment from 'moment';
 
-// tslint:disable-next-line: no-submodule-imports
 import useInterval from 'react-use/lib/useInterval';
 import styled from 'styled-components';
 import useUpdate from 'react-use/lib/useUpdate';
diff --git a/ts/components/conversation/TypingBubble.tsx b/ts/components/conversation/TypingBubble.tsx
index d3dd013607..f622f0233c 100644
--- a/ts/components/conversation/TypingBubble.tsx
+++ b/ts/components/conversation/TypingBubble.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
+import styled from 'styled-components';
 
 import { TypingAnimation } from './TypingAnimation';
-import styled from 'styled-components';
 import { ConversationTypeEnum } from '../../models/conversationAttributes';
 import { useSelectedIsGroup } from '../../state/selectors/selectedConversation';
 
diff --git a/ts/components/conversation/composition/CompositionBox.tsx b/ts/components/conversation/composition/CompositionBox.tsx
index da63b9c060..c4b4eb436a 100644
--- a/ts/components/conversation/composition/CompositionBox.tsx
+++ b/ts/components/conversation/composition/CompositionBox.tsx
@@ -1,30 +1,18 @@
-import React from 'react';
 import _, { debounce, isEmpty } from 'lodash';
+import React from 'react';
+import { connect } from 'react-redux';
+import styled from 'styled-components';
 
+import { AbortController } from 'abort-controller';
+import { Mention, MentionsInput, SuggestionDataItem } from 'react-mentions';
+
+import autoBind from 'auto-bind';
 import * as MIME from '../../../types/MIME';
 
 import { SessionEmojiPanel, StyledEmojiPanel } from '../SessionEmojiPanel';
 import { SessionRecording } from '../SessionRecording';
 
-import {
-  getPreview,
-  LINK_PREVIEW_TIMEOUT,
-  SessionStagedLinkPreview,
-} from '../SessionStagedLinkPreview';
-import { AbortController } from 'abort-controller';
-import { SessionQuotedMessageComposition } from '../SessionQuotedMessageComposition';
-import { Mention, MentionsInput, SuggestionDataItem } from 'react-mentions';
-import autoBind from 'auto-bind';
-import { getMediaPermissionsSettings } from '../../settings/SessionSettings';
-import { getDraftForConversation, updateDraftForConversation } from '../SessionConversationDrafts';
-import {
-  AddStagedAttachmentButton,
-  SendMessageButton,
-  StartRecordingButton,
-  ToggleEmojiButton,
-} from './CompositionButtons';
-import { AttachmentType } from '../../../types/Attachment';
-import { connect } from 'react-redux';
+import { SettingsKey } from '../../../data/settings-key';
 import { showLinkSharingConfirmationModalDialog } from '../../../interactions/conversationInteractions';
 import { getConversationController } from '../../../session/conversations';
 import { ToastUtils } from '../../../session/utils';
@@ -36,30 +24,43 @@ import {
   getQuotedMessage,
   getSelectedConversation,
 } from '../../../state/selectors/conversations';
-import { AttachmentUtil } from '../../../util';
-import { Flex } from '../../basic/Flex';
-import { CaptionEditor } from '../../CaptionEditor';
-import { StagedAttachmentList } from '../StagedAttachmentList';
+import {
+  getSelectedCanWrite,
+  getSelectedConversationKey,
+} from '../../../state/selectors/selectedConversation';
+import { AttachmentType } from '../../../types/Attachment';
 import { processNewAttachment } from '../../../types/MessageAttachment';
+import { FixedBaseEmoji } from '../../../types/Reaction';
+import { AttachmentUtil } from '../../../util';
 import {
   StagedAttachmentImportedType,
   StagedPreviewImportedType,
 } from '../../../util/attachmentsUtil';
+import { LinkPreviews } from '../../../util/linkPreviews';
+import { Flex } from '../../basic/Flex';
+import { CaptionEditor } from '../../CaptionEditor';
+import { getMediaPermissionsSettings } from '../../settings/SessionSettings';
+import { getDraftForConversation, updateDraftForConversation } from '../SessionConversationDrafts';
+import { SessionQuotedMessageComposition } from '../SessionQuotedMessageComposition';
+import {
+  getPreview,
+  LINK_PREVIEW_TIMEOUT,
+  SessionStagedLinkPreview,
+} from '../SessionStagedLinkPreview';
+import { StagedAttachmentList } from '../StagedAttachmentList';
+import {
+  AddStagedAttachmentButton,
+  SendMessageButton,
+  StartRecordingButton,
+  ToggleEmojiButton,
+} from './CompositionButtons';
+import { renderEmojiQuickResultRow, searchEmojiForQuery } from './EmojiQuickResult';
 import {
   cleanMentions,
   mentionsRegex,
   renderUserMentionRow,
   styleForCompositionBoxSuggestions,
 } from './UserMentions';
-import { renderEmojiQuickResultRow, searchEmojiForQuery } from './EmojiQuickResult';
-import { LinkPreviews } from '../../../util/linkPreviews';
-import styled from 'styled-components';
-import { FixedBaseEmoji } from '../../../types/Reaction';
-import {
-  getSelectedCanWrite,
-  getSelectedConversationKey,
-} from '../../../state/selectors/selectedConversation';
-import { SettingsKey } from '../../../data/settings-key';
 
 export interface ReplyingToMessageProps {
   convoId: string;
@@ -175,7 +176,7 @@ const getSelectionBasedOnMentions = (draft: string, index: number) => {
     lastMatchEndIndex = currentMatchStartIndex + match.length;
 
     const realLength = displayName.length + 1;
-    lastRealMatchEndIndex = lastRealMatchEndIndex + realLength;
+    lastRealMatchEndIndex += realLength;
 
     // the +1 is for the @
     return {
@@ -348,6 +349,7 @@ class CompositionBoxInner extends React.Component<Props, State> {
     }
     const { items } = e.clipboardData;
     let imgBlob = null;
+    // eslint-disable-next-line no-restricted-syntax
     for (const item of items as any) {
       const pasteType = item.type.split('/')[0];
       if (pasteType === 'image') {
@@ -402,7 +404,7 @@ class CompositionBoxInner extends React.Component<Props, State> {
     return (
       <SessionRecording
         sendVoiceMessage={this.sendVoiceMessage}
-        onLoadVoiceNoteView={this.onLoadVoiceNoteView}
+        onLoadVoiceNoteView={() => void this.onLoadVoiceNoteView()}
         onExitVoiceNoteView={this.onExitVoiceNoteView}
       />
     );
@@ -422,10 +424,10 @@ class CompositionBoxInner extends React.Component<Props, State> {
           multiple={true}
           ref={this.fileInput}
           type="file"
-          onChange={this.onChoseAttachment}
+          onChange={() => void this.onChoseAttachment()}
         />
 
-        {typingEnabled && <StartRecordingButton onClick={this.onLoadVoiceNoteView} />}
+        {typingEnabled && <StartRecordingButton onClick={() => void this.onLoadVoiceNoteView()} />}
 
         <StyledSendMessageInput
           role="main"
@@ -441,7 +443,7 @@ class CompositionBoxInner extends React.Component<Props, State> {
         {typingEnabled && (
           <ToggleEmojiButton ref={this.emojiPanelButton} onClick={this.toggleEmojiPanel} />
         )}
-        <SendMessageButton onClick={this.onSendMessage} />
+        <SendMessageButton onClick={() => void this.onSendMessage()} />
 
         {typingEnabled && showEmojiPanel && (
           <StyledEmojiPanelContainer role="button">
@@ -449,7 +451,7 @@ class CompositionBoxInner extends React.Component<Props, State> {
               ref={this.emojiPanel}
               show={showEmojiPanel}
               onEmojiClicked={this.onEmojiClick}
-              onKeyDown={this.onKeyDown}
+              onKeyDown={e => void this.onKeyDown(e)}
             />
           </StyledEmojiPanelContainer>
         )}
@@ -490,8 +492,8 @@ class CompositionBoxInner extends React.Component<Props, State> {
       <MentionsInput
         value={draft}
         onChange={this.onChange}
-        onKeyDown={this.onKeyDown}
-        onKeyUp={this.onKeyUp}
+        onKeyDown={e => void this.onKeyDown(e)}
+        onKeyUp={() => void this.onKeyUp()}
         placeholder={messagePlaceHolder}
         spellCheck={true}
         inputRef={this.textarea}
@@ -554,14 +556,16 @@ class CompositionBoxInner extends React.Component<Props, State> {
       return;
     }
 
-    if (this.props.selectedConversation.isPublic) {
-      this.fetchUsersForOpenGroup(overridenQuery, callback);
+    if (this.props.selectedConversation.isPrivate) {
       return;
     }
-    if (!this.props.selectedConversation.isPrivate) {
-      this.fetchUsersForClosedGroup(overridenQuery, callback);
+
+    if (this.props.selectedConversation.isPublic) {
+      this.fetchUsersForOpenGroup(overridenQuery, callback);
       return;
     }
+    // can only be a closed group here
+    this.fetchUsersForClosedGroup(overridenQuery, callback);
   }
 
   private fetchUsersForClosedGroup(
@@ -675,6 +679,7 @@ class CompositionBoxInner extends React.Component<Props, State> {
       abortController.abort();
     }, LINK_PREVIEW_TIMEOUT);
 
+    // eslint-disable-next-line more/no-then
     getPreview(firstLink, abortController.signal)
       .then(ret => {
         // we finished loading the preview, and checking the abortConrtoller, we are still not aborted.
@@ -843,7 +848,6 @@ class CompositionBoxInner extends React.Component<Props, State> {
     }
   }
 
-  // tslint:disable-next-line: cyclomatic-complexity
   private async onSendMessage() {
     if (!this.props.selectedConversationKey) {
       throw new Error('selectedConversationKey is needed');
diff --git a/ts/components/conversation/composition/CompositionButtons.tsx b/ts/components/conversation/composition/CompositionButtons.tsx
index fd797f7acb..bd651c3f5a 100644
--- a/ts/components/conversation/composition/CompositionButtons.tsx
+++ b/ts/components/conversation/composition/CompositionButtons.tsx
@@ -48,6 +48,7 @@ export const StartRecordingButton = (props: { onClick: () => void }) => {
   );
 };
 
+// eslint-disable-next-line react/display-name
 export const ToggleEmojiButton = React.forwardRef<HTMLDivElement, { onClick: () => void }>(
   (props, ref) => {
     return (
diff --git a/ts/components/conversation/composition/EmojiQuickResult.tsx b/ts/components/conversation/composition/EmojiQuickResult.tsx
index c1c1e3b514..2e8c400f11 100644
--- a/ts/components/conversation/composition/EmojiQuickResult.tsx
+++ b/ts/components/conversation/composition/EmojiQuickResult.tsx
@@ -1,8 +1,8 @@
 import React from 'react';
 import { SuggestionDataItem } from 'react-mentions';
 import styled from 'styled-components';
-// @ts-ignore
 import { SearchIndex } from 'emoji-mart';
+// eslint-disable-next-line import/extensions
 import { searchSync } from '../../../util/emoji.js';
 
 const EmojiQuickResult = styled.span`
diff --git a/ts/components/conversation/media-gallery/DocumentListItem.tsx b/ts/components/conversation/media-gallery/DocumentListItem.tsx
index 20cdfb249f..a6f122fe56 100644
--- a/ts/components/conversation/media-gallery/DocumentListItem.tsx
+++ b/ts/components/conversation/media-gallery/DocumentListItem.tsx
@@ -2,7 +2,7 @@ import classNames from 'classnames';
 import React, { useCallback } from 'react';
 
 import moment from 'moment';
-// tslint:disable-next-line:match-default-export-name
+
 import formatFileSize from 'filesize';
 import { saveAttachmentToDisk } from '../../../util/attachmentsUtil';
 import { MediaItemType } from '../../lightbox/LightboxGallery';
diff --git a/ts/components/conversation/media-gallery/MediaGridItem.tsx b/ts/components/conversation/media-gallery/MediaGridItem.tsx
index 1b295febaf..1b4822afae 100644
--- a/ts/components/conversation/media-gallery/MediaGridItem.tsx
+++ b/ts/components/conversation/media-gallery/MediaGridItem.tsx
@@ -28,7 +28,6 @@ const MediaGridItemContent = (props: Props) => {
   const disableDrag = useDisableDrag();
 
   const onImageError = () => {
-    // tslint:disable-next-line no-console
     window.log.info('MediaGridItem: Image failed to load; failing over to placeholder');
     setImageBroken(true);
   };
@@ -58,7 +57,8 @@ const MediaGridItemContent = (props: Props) => {
         onDragStart={disableDrag}
       />
     );
-  } else if (contentType && isVideoTypeSupported(contentType)) {
+  }
+  if (contentType && isVideoTypeSupported(contentType)) {
     if (imageBroken || !srcData) {
       return (
         <div
diff --git a/ts/components/conversation/media-gallery/groupMediaItemsByDate.ts b/ts/components/conversation/media-gallery/groupMediaItemsByDate.ts
index 9bb250151e..b01ed751dd 100644
--- a/ts/components/conversation/media-gallery/groupMediaItemsByDate.ts
+++ b/ts/components/conversation/media-gallery/groupMediaItemsByDate.ts
@@ -45,12 +45,12 @@ const toSection = (
   messagesWithSection: Array<MediaItemWithSection> | undefined
 ): Section | undefined => {
   if (!messagesWithSection || messagesWithSection.length === 0) {
-    return;
+    return undefined;
   }
 
   const firstMediaItemWithSection: MediaItemWithSection = messagesWithSection[0];
   if (!firstMediaItemWithSection) {
-    return;
+    return undefined;
   }
 
   const mediaItems = messagesWithSection.map(messageWithSection => messageWithSection.mediaItem);
@@ -71,11 +71,7 @@ const toSection = (
         mediaItems,
       };
     default:
-      // NOTE: Investigate why we get the following error:
-      // error TS2345: Argument of type 'any' is not assignable to parameter
-      // of type 'never'.
-      // return missingCaseError(firstMediaItemWithSection.type);
-      return;
+      return undefined;
   }
 };
 
diff --git a/ts/components/conversation/message/message-content/ClickToTrustSender.tsx b/ts/components/conversation/message/message-content/ClickToTrustSender.tsx
index 1d5e7e8ac3..88cb651553 100644
--- a/ts/components/conversation/message/message-content/ClickToTrustSender.tsx
+++ b/ts/components/conversation/message/message-content/ClickToTrustSender.tsx
@@ -111,7 +111,7 @@ export const ClickToTrustSender = (props: { messageId: string }) => {
   };
 
   return (
-    <StyledTrustSenderUI onClick={openConfirmationModal}>
+    <StyledTrustSenderUI onClick={e => void openConfirmationModal(e)}>
       <SessionIcon iconSize="small" iconType="gallery" />
       <ClickToDownload>{window.i18n('clickToTrustContact')}</ClickToDownload>
     </StyledTrustSenderUI>
diff --git a/ts/components/conversation/message/message-content/MessageAttachment.tsx b/ts/components/conversation/message/message-content/MessageAttachment.tsx
index 764abe9cbb..18f98c8946 100644
--- a/ts/components/conversation/message/message-content/MessageAttachment.tsx
+++ b/ts/components/conversation/message/message-content/MessageAttachment.tsx
@@ -1,5 +1,7 @@
 import React, { useCallback } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
+import styled from 'styled-components';
+import classNames from 'classnames';
 import { clone } from 'lodash';
 import { Data } from '../../../../data/data';
 import { MessageModelType, MessageRenderingProps } from '../../../../models/messageType';
@@ -29,8 +31,6 @@ import { AudioPlayerWithEncryptedFile } from '../../H5AudioPlayer';
 import { ImageGrid } from '../../ImageGrid';
 import { LightBoxOptions } from '../../SessionConversation';
 import { ClickToTrustSender } from './ClickToTrustSender';
-import styled from 'styled-components';
-import classNames from 'classnames';
 import { StyledMessageHighlighter } from './MessageContent';
 
 export type MessageAttachmentSelectorProps = Pick<
@@ -51,7 +51,6 @@ type Props = {
   handleImageError: () => void;
   highlight?: boolean;
 };
-// tslint:disable: use-simple-attributes
 
 const StyledAttachmentContainer = styled.div<{
   messageDirection: MessageModelType;
@@ -63,7 +62,6 @@ const StyledAttachmentContainer = styled.div<{
   justify-content: ${props => (props.messageDirection === 'incoming' ? 'flex-start' : 'flex-end')};
 `;
 
-// tslint:disable-next-line max-func-body-length cyclomatic-complexity
 export const MessageAttachment = (props: Props) => {
   const { messageId, imageBroken, handleImageError, highlight = false } = props;
 
@@ -82,21 +80,21 @@ export const MessageAttachment = (props: Props) => {
         });
       }
     },
-    [messageId, multiSelectMode]
+    [dispatch, messageId, multiSelectMode]
   );
 
   const onClickOnGenericAttachment = useCallback(
     (e: any) => {
       e.stopPropagation();
       e.preventDefault();
-      if (!attachments?.length) {
+      if (!attachmentProps?.attachments?.length) {
         return;
       }
 
       const messageTimestamp = attachmentProps?.timestamp || attachmentProps?.serverTimestamp || 0;
       if (attachmentProps?.sender && attachmentProps?.convoId) {
         void saveAttachmentToDisk({
-          attachment: attachments[0],
+          attachment: attachmentProps?.attachments[0],
           messageTimestamp,
           messageSender: attachmentProps?.sender,
           conversationId: attachmentProps?.convoId,
diff --git a/ts/components/conversation/message/message-content/MessageAuthorText.tsx b/ts/components/conversation/message/message-content/MessageAuthorText.tsx
index a77d8342d9..8ebd3b19b7 100644
--- a/ts/components/conversation/message/message-content/MessageAuthorText.tsx
+++ b/ts/components/conversation/message/message-content/MessageAuthorText.tsx
@@ -36,7 +36,7 @@ export const MessageAuthorText = (props: Props) => {
     return null;
   }
 
-  const title = authorName ? authorName : sender;
+  const title = authorName || sender;
 
   if (direction !== 'incoming' || !isGroup || !title || !firstMessageOfSeries) {
     return null;
diff --git a/ts/components/conversation/message/message-content/MessageAvatar.tsx b/ts/components/conversation/message/message-content/MessageAvatar.tsx
index 85e71eb6c7..0994be253d 100644
--- a/ts/components/conversation/message/message-content/MessageAvatar.tsx
+++ b/ts/components/conversation/message/message-content/MessageAvatar.tsx
@@ -16,14 +16,13 @@ import {
   useLastMessageOfSeries,
   useMessageAuthor,
   useMessageSenderIsAdmin,
-} from '../../../../state/selectors/';
+} from '../../../../state/selectors';
 import {
   getSelectedCanWrite,
   useSelectedConversationKey,
   useSelectedIsPublic,
 } from '../../../../state/selectors/selectedConversation';
 import { Avatar, AvatarSize, CrownIcon } from '../../../avatar/Avatar';
-// tslint:disable: use-simple-attributes
 
 const StyledAvatar = styled.div`
   position: relative;
@@ -54,13 +53,12 @@ export const MessageAvatar = (props: Props) => {
   const lastMessageOfSeries = useLastMessageOfSeries(messageId);
   const isSenderAdmin = useMessageSenderIsAdmin(messageId);
 
-  if (!sender) {
-    return null;
-  }
-
   const userName = authorName || authorProfileName || sender;
 
   const onMessageAvatarClick = useCallback(async () => {
+    if (!sender) {
+      return;
+    }
     if (isPublic && !PubKey.isBlinded(sender)) {
       // public chat but session id not blinded. disable showing user details if we do not have an active convo with that user.
       // an unactive convo with that user means that we never chatted with that id directyly, but only through a sogs
@@ -112,15 +110,19 @@ export const MessageAvatar = (props: Props) => {
 
       return;
     }
-    //not public, i.e. closed group. Just open dialog for the user to do what he wants
+    // not public, i.e. closed group. Just open dialog for the user to do what he wants
     dispatch(
       updateUserDetailsModal({
         conversationId: sender,
-        userName,
+        userName: userName || '',
         authorAvatarPath,
       })
     );
-  }, [userName, sender, isPublic, authorAvatarPath, selectedConvoKey]);
+  }, [dispatch, isTypingEnabled, userName, sender, isPublic, authorAvatarPath, selectedConvoKey]);
+
+  if (!sender) {
+    return null;
+  }
 
   if (isPrivate) {
     return null;
@@ -137,7 +139,11 @@ export const MessageAvatar = (props: Props) => {
         visibility: hideAvatar ? 'hidden' : undefined,
       }}
     >
-      <Avatar size={AvatarSize.S} onAvatarClick={onMessageAvatarClick} pubkey={sender} />
+      <Avatar
+        size={AvatarSize.S}
+        onAvatarClick={() => void onMessageAvatarClick()}
+        pubkey={sender}
+      />
       {isSenderAdmin && <CrownIcon />}
     </StyledAvatar>
   );
diff --git a/ts/components/conversation/message/message-content/MessageBody.tsx b/ts/components/conversation/message/message-content/MessageBody.tsx
index ba4c675674..4bd3c2efd3 100644
--- a/ts/components/conversation/message/message-content/MessageBody.tsx
+++ b/ts/components/conversation/message/message-content/MessageBody.tsx
@@ -1,15 +1,15 @@
-import React, { useCallback } from 'react';
-import { useDispatch } from 'react-redux';
 import LinkifyIt from 'linkify-it';
+import React from 'react';
+import { useDispatch } from 'react-redux';
+import styled from 'styled-components';
 
 import { RenderTextCallbackType } from '../../../../types/Util';
 import { getEmojiSizeClass, SizeClassType } from '../../../../util/emoji';
+import { LinkPreviews } from '../../../../util/linkPreviews';
+import { showLinkVisitWarningDialog } from '../../../dialog/SessionConfirm';
 import { AddMentions } from '../../AddMentions';
 import { AddNewLines } from '../../AddNewLines';
 import { Emojify } from '../../Emojify';
-import { LinkPreviews } from '../../../../util/linkPreviews';
-import { showLinkVisitWarningDialog } from '../../../dialog/SessionConfirm';
-import styled from 'styled-components';
 
 const linkify = LinkifyIt();
 
@@ -30,7 +30,6 @@ export const renderTextDefault: RenderTextCallbackType = ({ text }) => <>{text}<
 
 const renderNewLines: RenderTextCallbackType = ({ text: textWithNewLines, key, isGroup }) => {
   return (
-    // tslint:disable-next-line: use-simple-attributes
     <AddNewLines
       key={key}
       text={textWithNewLines}
@@ -106,17 +105,6 @@ const Linkify = (props: LinkifyProps): JSX.Element => {
   const matchData = linkify.match(text) || [];
   let last = 0;
 
-  // disable click on <a> elements so clicking a message containing a link doesn't
-  // select the message. The link will still be opened in the browser.
-  const handleClick = useCallback((e: any) => {
-    e.preventDefault();
-    e.stopPropagation();
-
-    const url = e.target.href;
-
-    showLinkVisitWarningDialog(url, dispatch);
-  }, []);
-
   if (matchData.length === 0) {
     return renderNonLink({ text, key: 0, isGroup });
   }
@@ -130,8 +118,19 @@ const Linkify = (props: LinkifyProps): JSX.Element => {
     const { url, text: originalText } = match;
     const isLink = SUPPORTED_PROTOCOLS.test(url) && !LinkPreviews.isLinkSneaky(url);
     if (isLink) {
+      // disable click on <a> elements so clicking a message containing a link doesn't
+      // select the message. The link will still be opened in the browser.
+
       results.push(
-        <a key={count++} href={url} onClick={handleClick}>
+        <a
+          key={count++}
+          href={url}
+          onClick={e => {
+            e.preventDefault();
+            e.stopPropagation();
+            showLinkVisitWarningDialog(url, dispatch);
+          }}
+        >
           {originalText}
         </a>
       );
diff --git a/ts/components/conversation/message/message-content/MessageContent.tsx b/ts/components/conversation/message/message-content/MessageContent.tsx
index b9f84062eb..2d5aaef32d 100644
--- a/ts/components/conversation/message/message-content/MessageContent.tsx
+++ b/ts/components/conversation/message/message-content/MessageContent.tsx
@@ -28,6 +28,8 @@ type Props = {
   isDetailView?: boolean;
 };
 
+// TODO not too sure what is this doing? It is not preventDefault()
+// or stopPropagation() so I think this is never cancelling a click event?
 function onClickOnMessageInnerContainer(event: React.MouseEvent<HTMLDivElement>) {
   const selection = window.getSelection();
   // Text is being selected
@@ -38,6 +40,7 @@ function onClickOnMessageInnerContainer(event: React.MouseEvent<HTMLDivElement>)
   // User clicked on message body
   const target = event.target as HTMLDivElement;
   if (target.className === 'text-selectable' || window.contextMenuShown) {
+    // eslint-disable-next-line no-useless-return
     return;
   }
 }
@@ -86,7 +89,6 @@ const StyledMessageOpaqueContent = styled(StyledMessageHighlighter)<{
 `;
 
 export const IsMessageVisibleContext = createContext(false);
-// tslint:disable: use-simple-attributes
 
 export const MessageContent = (props: Props) => {
   const [highlight, setHighlight] = useState(false);
@@ -101,7 +103,7 @@ export const MessageContent = (props: Props) => {
 
   const [imageBroken, setImageBroken] = useState(false);
 
-  const onVisible = (inView: boolean | Object) => {
+  const onVisible = (inView: boolean | object) => {
     if (
       inView === true ||
       ((inView as any).type === 'focus' && (inView as any).returnValue === true)
@@ -123,7 +125,7 @@ export const MessageContent = (props: Props) => {
   useLayoutEffect(() => {
     if (isQuotedMessageToAnimate) {
       if (!highlight && !didScroll) {
-        //scroll to me and flash me
+        // scroll to me and flash me
         scrollToLoadedMessage(props.messageId, 'quote-or-search-result');
         setDidScroll(true);
         if (shouldHighlightMessage) {
@@ -139,8 +141,14 @@ export const MessageContent = (props: Props) => {
     if (didScroll) {
       setDidScroll(false);
     }
-    return;
-  });
+  }, [
+    isQuotedMessageToAnimate,
+    highlight,
+    didScroll,
+    scrollToLoadedMessage,
+    props.messageId,
+    shouldHighlightMessage,
+  ]);
 
   if (!contentProps) {
     return null;
diff --git a/ts/components/conversation/message/message-content/MessageContentWithStatus.tsx b/ts/components/conversation/message/message-content/MessageContentWithStatus.tsx
index 9296ee1c98..ad0e1bff93 100644
--- a/ts/components/conversation/message/message-content/MessageContentWithStatus.tsx
+++ b/ts/components/conversation/message/message-content/MessageContentWithStatus.tsx
@@ -11,7 +11,7 @@ import {
   isMessageSelectionMode,
 } from '../../../../state/selectors/conversations';
 import { Reactions } from '../../../../util/reactions';
-import { MessageAvatar } from '../message-content/MessageAvatar';
+import { MessageAvatar } from './MessageAvatar';
 import { MessageAuthorText } from './MessageAuthorText';
 import { MessageContent } from './MessageContent';
 import { MessageContextMenu } from './MessageContextMenu';
@@ -30,7 +30,6 @@ type Props = {
   dataTestId?: string;
   enableReactions: boolean;
 };
-// tslint:disable: use-simple-attributes
 
 const StyledMessageContentContainer = styled.div<{ direction: 'left' | 'right' }>`
   display: flex;
@@ -60,13 +59,13 @@ export const MessageContentWithStatuses = (props: Props) => {
 
   const onClickOnMessageOuterContainer = useCallback(
     (event: React.MouseEvent<HTMLDivElement>) => {
-      if (multiSelectMode && messageId) {
+      if (multiSelectMode && props?.messageId) {
         event.preventDefault();
         event.stopPropagation();
-        dispatch(toggleSelectedMessageId(messageId));
+        dispatch(toggleSelectedMessageId(props?.messageId));
       }
     },
-    [window.contextMenuShown, props?.messageId, multiSelectMode, props?.isDetailView]
+    [dispatch, props?.messageId, multiSelectMode]
   );
 
   const onDoubleClickReplyToMessage = (e: React.MouseEvent<HTMLDivElement>) => {
@@ -84,12 +83,12 @@ export const MessageContentWithStatuses = (props: Props) => {
         void replyToMessage(messageId);
         currentSelection?.empty();
         e.preventDefault();
-        return;
       }
     }
   };
 
   const { messageId, ctxMenuID, isDetailView, dataTestId, enableReactions } = props;
+  const [popupReaction, setPopupReaction] = useState('');
 
   if (!contentProps) {
     return null;
@@ -100,8 +99,6 @@ export const MessageContentWithStatuses = (props: Props) => {
   const isPrivate = conversationType === 'private';
   const hideAvatar = isPrivate || direction === 'outgoing';
 
-  const [popupReaction, setPopupReaction] = useState('');
-
   const handleMessageReaction = async (emoji: string) => {
     await Reactions.sendMessageReaction(messageId, emoji);
   };
@@ -150,7 +147,7 @@ export const MessageContentWithStatuses = (props: Props) => {
       {enableReactions && (
         <MessageReactions
           messageId={messageId}
-          onClick={handleMessageReaction}
+          onClick={emoji => void handleMessageReaction(emoji)}
           popupReaction={popupReaction}
           setPopupReaction={setPopupReaction}
           onPopupClick={handlePopupClick}
diff --git a/ts/components/conversation/message/message-content/MessageContextMenu.tsx b/ts/components/conversation/message/message-content/MessageContextMenu.tsx
index 7e8c70b1ae..ec9b458506 100644
--- a/ts/components/conversation/message/message-content/MessageContextMenu.tsx
+++ b/ts/components/conversation/message/message-content/MessageContextMenu.tsx
@@ -2,10 +2,11 @@ import React, { useCallback, useEffect, useRef, useState } from 'react';
 
 import { animation, Item, Menu, useContextMenu } from 'react-contexify';
 
-import { useDispatch, useSelector } from 'react-redux';
+import { useDispatch } from 'react-redux';
 import { useClickAway, useMouse } from 'react-use';
 import styled from 'styled-components';
 import { Data } from '../../../../data/data';
+
 import { MessageInteraction } from '../../../../interactions';
 import { replyToMessage } from '../../../../interactions/conversationInteractions';
 import {
@@ -22,8 +23,6 @@ import {
   showMessageDetailsView,
   toggleSelectedMessageId,
 } from '../../../../state/ducks/conversations';
-import { StateType } from '../../../../state/reducer';
-import { getMessageContextMenuProps } from '../../../../state/selectors/conversations';
 import {
   useSelectedConversationKey,
   useSelectedIsBlocked,
@@ -36,10 +35,21 @@ import { Reactions } from '../../../../util/reactions';
 import { SessionContextMenuContainer } from '../../../SessionContextMenuContainer';
 import { SessionEmojiPanel, StyledEmojiPanel } from '../../SessionEmojiPanel';
 import { MessageReactBar } from './MessageReactBar';
+import {
+  useMessageAttachments,
+  useMessageBody,
+  useMessageDirection,
+  useMessageIsDeletable,
+  useMessageIsDeletableForEveryone,
+  useMessageSender,
+  useMessageSenderIsAdmin,
+  useMessageServerTimestamp,
+  useMessageStatus,
+  useMessageTimestamp,
+} from '../../../../state/selectors';
 
 export type MessageContextMenuSelectorProps = Pick<
   MessageRenderingProps,
-  | 'attachments'
   | 'sender'
   | 'direction'
   | 'status'
@@ -48,7 +58,6 @@ export type MessageContextMenuSelectorProps = Pick<
   | 'text'
   | 'serverTimestamp'
   | 'timestamp'
-  | 'isDeletableForEveryone'
 >;
 
 type Props = { messageId: string; contextMenuId: string; enableReactions: boolean };
@@ -76,41 +85,139 @@ const StyledEmojiPanelContainer = styled.div<{ x: number; y: number }>`
   }
 `;
 
-// tslint:disable: max-func-body-length cyclomatic-complexity
-export const MessageContextMenu = (props: Props) => {
-  const { messageId, contextMenuId, enableReactions } = props;
-  const dispatch = useDispatch();
-  const { hideAll } = useContextMenu();
+const DeleteForEveryone = ({ messageId }: { messageId: string }) => {
+  const convoId = useSelectedConversationKey();
+  const isDeletableForEveryone = useMessageIsDeletableForEveryone(messageId);
+  if (!convoId || !isDeletableForEveryone) {
+    return null;
+  }
+  const onDeleteForEveryone = () => {
+    void deleteMessagesByIdForEveryone([messageId], convoId);
+  };
 
-  const isSelectedBlocked = useSelectedIsBlocked();
+  const unsendMessageText = window.i18n('deleteForEveryone');
+
+  return <Item onClick={onDeleteForEveryone}>{unsendMessageText}</Item>;
+};
+
+type MessageId = { messageId: string };
+
+const SaveAttachment = ({ messageId }: MessageId) => {
   const convoId = useSelectedConversationKey();
-  const isPublic = useSelectedIsPublic();
+  const attachments = useMessageAttachments(messageId);
+  const timestamp = useMessageTimestamp(messageId);
+  const serverTimestamp = useMessageServerTimestamp(messageId);
+
+  const sender = useMessageSender(messageId);
+  const saveAttachment = useCallback(
+    (e: any) => {
+      // this is quite dirty but considering that we want the context menu of the message to show on click on the attachment
+      // and the context menu save attachment item to save the right attachment I did not find a better way for now.
+      let targetAttachmentIndex = e.triggerEvent.path[1].getAttribute('data-attachmentindex');
+      e.event.stopPropagation();
+      if (!attachments?.length || !convoId || !sender) {
+        return;
+      }
+
+      if (!targetAttachmentIndex) {
+        targetAttachmentIndex = 0;
+      }
+      if (targetAttachmentIndex > attachments.length) {
+        return;
+      }
+      const messageTimestamp = timestamp || serverTimestamp || 0;
+      void saveAttachmentToDisk({
+        attachment: attachments[targetAttachmentIndex],
+        messageTimestamp,
+        messageSender: sender,
+        conversationId: convoId,
+      });
+    },
+    [convoId, sender, attachments, serverTimestamp, timestamp]
+  );
+
+  if (!convoId) {
+    return null;
+  }
+
+  return attachments?.length ? (
+    <Item onClick={saveAttachment}>{window.i18n('downloadAttachment')}</Item>
+  ) : null;
+};
+
+const AdminActionItems = ({ messageId }: MessageId) => {
+  const convoId = useSelectedConversationKey();
+
   const weAreModerator = useSelectedWeAreModerator();
   const weAreAdmin = useSelectedWeAreAdmin();
-
   const showAdminActions = weAreAdmin || weAreModerator;
+  const sender = useMessageSender(messageId);
+  const isSenderAdmin = useMessageSenderIsAdmin(messageId);
 
-  const selected = useSelector((state: StateType) => getMessageContextMenuProps(state, messageId));
-
-  if (!selected || !convoId) {
+  if (!convoId || !sender) {
     return null;
   }
 
-  const {
-    attachments,
-    sender,
-    direction,
-    status,
-    isDeletable,
-    isDeletableForEveryone,
-    isSenderAdmin,
-    text,
-    serverTimestamp,
-    timestamp,
-  } = selected;
+  const addModerator = () => {
+    void addSenderAsModerator(sender, convoId);
+  };
+
+  const removeModerator = () => {
+    void removeSenderFromModerator(sender, convoId);
+  };
 
+  const onBan = () => {
+    MessageInteraction.banUser(sender, convoId);
+  };
+
+  const onUnban = () => {
+    MessageInteraction.unbanUser(sender, convoId);
+  };
+
+  return showAdminActions ? (
+    <>
+      <Item onClick={onBan}>{window.i18n('banUser')}</Item>
+      <Item onClick={onUnban}>{window.i18n('unbanUser')}</Item>
+      {isSenderAdmin ? (
+        <Item onClick={removeModerator}>{window.i18n('removeFromModerators')}</Item>
+      ) : (
+        <Item onClick={addModerator}>{window.i18n('addAsModerator')}</Item>
+      )}
+    </>
+  ) : null;
+};
+
+const RetryItem = ({ messageId }: MessageId) => {
+  const direction = useMessageDirection(messageId);
+
+  const status = useMessageStatus(messageId);
   const isOutgoing = direction === 'outgoing';
+
   const showRetry = status === 'error' && isOutgoing;
+  const onRetry = useCallback(async () => {
+    const found = await Data.getMessageById(messageId);
+    if (found) {
+      await found.retrySend();
+    }
+  }, [messageId]);
+  return showRetry ? <Item onClick={() => void onRetry()}>{window.i18n('resend')}</Item> : null;
+};
+
+export const MessageContextMenu = (props: Props) => {
+  const { messageId, contextMenuId, enableReactions } = props;
+  const dispatch = useDispatch();
+  const { hideAll } = useContextMenu();
+
+  const isSelectedBlocked = useSelectedIsBlocked();
+  const convoId = useSelectedConversationKey();
+  const isPublic = useSelectedIsPublic();
+
+  const direction = useMessageDirection(messageId);
+  const status = useMessageStatus(messageId);
+  const isDeletable = useMessageIsDeletable(messageId);
+  const text = useMessageBody(messageId);
+
+  const isOutgoing = direction === 'outgoing';
   const isSent = status === 'sent' || status === 'read'; // a read message should be replyable
 
   const emojiPanelRef = useRef<HTMLDivElement>(null);
@@ -152,15 +259,6 @@ export const MessageContextMenu = (props: Props) => {
 
   const selectMessageText = window.i18n('selectMessage');
   const deleteMessageJustForMeText = window.i18n('deleteJustForMe');
-  const unsendMessageText = window.i18n('deleteForEveryone');
-
-  const addModerator = useCallback(() => {
-    void addSenderAsModerator(sender, convoId);
-  }, [sender, convoId]);
-
-  const removeModerator = useCallback(() => {
-    void removeSenderFromModerator(sender, convoId);
-  }, [sender, convoId]);
 
   const onReply = useCallback(() => {
     if (isSelectedBlocked) {
@@ -170,62 +268,18 @@ export const MessageContextMenu = (props: Props) => {
     void replyToMessage(messageId);
   }, [isSelectedBlocked, messageId]);
 
-  const saveAttachment = useCallback(
-    (e: any) => {
-      // this is quite dirty but considering that we want the context menu of the message to show on click on the attachment
-      // and the context menu save attachment item to save the right attachment I did not find a better way for now.
-      let targetAttachmentIndex = e.triggerEvent.path[1].getAttribute('data-attachmentindex');
-      e.event.stopPropagation();
-      if (!attachments?.length) {
-        return;
-      }
-
-      if (!targetAttachmentIndex) {
-        targetAttachmentIndex = 0;
-      }
-      if (targetAttachmentIndex > attachments.length) {
-        return;
-      }
-      const messageTimestamp = timestamp || serverTimestamp || 0;
-      void saveAttachmentToDisk({
-        attachment: attachments[targetAttachmentIndex],
-        messageTimestamp,
-        messageSender: sender,
-        conversationId: convoId,
-      });
-    },
-    [convoId, sender, timestamp, serverTimestamp, convoId, attachments]
-  );
-
   const copyText = useCallback(() => {
     MessageInteraction.copyBodyToClipboard(text);
   }, [text]);
 
-  const onRetry = useCallback(async () => {
-    const found = await Data.getMessageById(messageId);
-    if (found) {
-      await found.retrySend();
-    }
-  }, [messageId]);
-
-  const onBan = useCallback(() => {
-    MessageInteraction.banUser(sender, convoId);
-  }, [sender, convoId]);
-
-  const onUnban = useCallback(() => {
-    MessageInteraction.unbanUser(sender, convoId);
-  }, [sender, convoId]);
-
   const onSelect = useCallback(() => {
     dispatch(toggleSelectedMessageId(messageId));
-  }, [messageId]);
+  }, [dispatch, messageId]);
 
   const onDelete = useCallback(() => {
-    void deleteMessagesById([messageId], convoId);
-  }, [convoId, messageId]);
-
-  const onDeleteForEveryone = useCallback(() => {
-    void deleteMessagesByIdForEveryone([messageId], convoId);
+    if (convoId) {
+      void deleteMessagesById([messageId], convoId);
+    }
   }, [convoId, messageId]);
 
   const onShowEmoji = () => {
@@ -241,7 +295,7 @@ export const MessageContextMenu = (props: Props) => {
   };
 
   const onEmojiLoseFocus = () => {
-    window.log.info('closed due to lost focus');
+    window.log.debug('closed due to lost focus');
     onCloseEmoji();
   };
 
@@ -262,7 +316,7 @@ export const MessageContextMenu = (props: Props) => {
   });
 
   useEffect(() => {
-    if (emojiPanelRef.current && emojiPanelRef.current) {
+    if (emojiPanelRef.current) {
       const { innerWidth: windowWidth, innerHeight: windowHeight } = window;
 
       if (mouseX + emojiPanelWidth > windowWidth) {
@@ -284,15 +338,18 @@ export const MessageContextMenu = (props: Props) => {
         setMouseY(mouseY - y);
       }
     }
-  }, [emojiPanelRef.current, emojiPanelWidth, emojiPanelHeight, mouseX, mouseY]);
+  }, [emojiPanelWidth, emojiPanelHeight, mouseX, mouseY]);
 
+  if (!convoId) {
+    return null;
+  }
   return (
     <StyledMessageContextMenu ref={contextMenuRef}>
       {enableReactions && showEmojiPanel && (
         <StyledEmojiPanelContainer role="button" x={mouseX} y={mouseY}>
           <SessionEmojiPanel
             ref={emojiPanelRef}
-            onEmojiClicked={onEmojiClick}
+            onEmojiClicked={e => void onEmojiClick(e)}
             show={showEmojiPanel}
             isModal={true}
             onKeyDown={onEmojiKeyDown}
@@ -307,46 +364,24 @@ export const MessageContextMenu = (props: Props) => {
           animation={animation.fade}
         >
           {enableReactions && (
-            <MessageReactBar action={onEmojiClick} additionalAction={onShowEmoji} />
+            <MessageReactBar action={e => void onEmojiClick(e)} additionalAction={onShowEmoji} />
           )}
-          {attachments?.length ? (
-            <Item onClick={saveAttachment}>{window.i18n('downloadAttachment')}</Item>
-          ) : null}
+          <SaveAttachment messageId={messageId} />
 
           <Item onClick={copyText}>{window.i18n('copyMessage')}</Item>
           {(isSent || !isOutgoing) && (
             <Item onClick={onReply}>{window.i18n('replyToMessage')}</Item>
           )}
           {(!isPublic || isOutgoing) && (
-            <Item onClick={onShowDetail}>{window.i18n('moreInformation')}</Item>
+            <Item onClick={() => void onShowDetail()}>{window.i18n('moreInformation')}</Item>
           )}
-          {showRetry ? <Item onClick={onRetry}>{window.i18n('resend')}</Item> : null}
-          {isDeletable ? (
-            <>
-              <Item onClick={onSelect}>{selectMessageText}</Item>
-            </>
-          ) : null}
+          <RetryItem messageId={messageId} />
+          {isDeletable ? <Item onClick={onSelect}>{selectMessageText}</Item> : null}
           {isDeletable && !isPublic ? (
-            <>
-              <Item onClick={onDelete}>{deleteMessageJustForMeText}</Item>
-            </>
-          ) : null}
-          {isDeletableForEveryone ? (
-            <>
-              <Item onClick={onDeleteForEveryone}>{unsendMessageText}</Item>
-            </>
-          ) : null}
-          {showAdminActions ? (
-            <>
-              <Item onClick={onBan}>{window.i18n('banUser')}</Item>
-              <Item onClick={onUnban}>{window.i18n('unbanUser')}</Item>
-              {isSenderAdmin ? (
-                <Item onClick={removeModerator}>{window.i18n('removeFromModerators')}</Item>
-              ) : (
-                <Item onClick={addModerator}>{window.i18n('addAsModerator')}</Item>
-              )}
-            </>
+            <Item onClick={onDelete}>{deleteMessageJustForMeText}</Item>
           ) : null}
+          <DeleteForEveryone messageId={messageId} />
+          <AdminActionItems messageId={messageId} />
         </Menu>
       </SessionContextMenuContainer>
     </StyledMessageContextMenu>
diff --git a/ts/components/conversation/message/message-content/MessageQuote.tsx b/ts/components/conversation/message/message-content/MessageQuote.tsx
index fc196f39ea..054c9707cd 100644
--- a/ts/components/conversation/message/message-content/MessageQuote.tsx
+++ b/ts/components/conversation/message/message-content/MessageQuote.tsx
@@ -1,5 +1,5 @@
 import { isEmpty, toNumber } from 'lodash';
-import React, { useCallback } from 'react';
+import React from 'react';
 import { useSelector } from 'react-redux';
 import { Data } from '../../../../data/data';
 import { MessageRenderingProps } from '../../../../models/messageType';
@@ -10,12 +10,9 @@ import { useMessageDirection } from '../../../../state/selectors';
 import {
   getMessageQuoteProps,
   isMessageDetailView,
-  isMessageSelectionMode,
 } from '../../../../state/selectors/conversations';
 import { Quote } from './quote/Quote';
 
-// tslint:disable: use-simple-attributes
-
 type Props = {
   messageId: string;
 };
@@ -25,7 +22,6 @@ export type MessageQuoteSelectorProps = Pick<MessageRenderingProps, 'quote' | 'd
 export const MessageQuote = (props: Props) => {
   const selected = useSelector((state: StateType) => getMessageQuoteProps(state, props.messageId));
   const direction = useMessageDirection(props.messageId);
-  const multiSelectMode = useSelector(isMessageSelectionMode);
   const isMessageDetailViewMode = useSelector(isMessageDetailView);
 
   if (!selected || isEmpty(selected)) {
@@ -42,70 +38,67 @@ export const MessageQuote = (props: Props) => {
     quote.referencedMessageNotFound || !quote?.author || !quote.id || !quote.convoId
   );
 
-  const onQuoteClick = useCallback(
-    async (event: React.MouseEvent<HTMLDivElement>) => {
-      event.preventDefault();
-      event.stopPropagation();
-
-      if (!quote) {
-        ToastUtils.pushOriginalNotFound();
-        window.log.warn('onQuoteClick: quote not valid');
-        return;
-      }
-
-      if (isMessageDetailViewMode) {
-        // trying to scroll while in the container while the message detail view is shown has unknown effects
-        return;
-      }
-
-      let conversationKey = String(quote.convoId);
-      let messageIdToNavigateTo = String(quote.id);
-      let quoteNotFoundInDB = false;
-
-      // If the quote is not found in memory, we try to find it in the DB
-      if (quoteNotFound && quote.id && quote.author) {
-        // We always look for the quote by sentAt timestamp, for opengroups, closed groups and session chats
-        // this will return an array of sent messages by id that we have locally.
-        const quotedMessagesCollection = await Data.getMessagesBySenderAndSentAt([
-          {
-            timestamp: toNumber(quote.id),
-            source: quote.author,
-          },
-        ]);
-
-        if (quotedMessagesCollection?.length) {
-          const quotedMessage = quotedMessagesCollection.at(0);
-          // If found, we navigate to the quoted message which also refreshes the message quote component
-          if (quotedMessage) {
-            conversationKey = String(quotedMessage.get('conversationId'));
-            messageIdToNavigateTo = String(quotedMessage.id);
-          } else {
-            quoteNotFoundInDB = true;
-          }
+  const onQuoteClick = async (event: React.MouseEvent<HTMLDivElement>) => {
+    event.preventDefault();
+    event.stopPropagation();
+
+    if (!quote) {
+      ToastUtils.pushOriginalNotFound();
+      window.log.warn('onQuoteClick: quote not valid');
+      return;
+    }
+
+    if (isMessageDetailViewMode) {
+      // trying to scroll while in the container while the message detail view is shown has unknown effects
+      return;
+    }
+
+    let conversationKey = String(quote.convoId);
+    let messageIdToNavigateTo = String(quote.id);
+    let quoteNotFoundInDB = false;
+
+    // If the quote is not found in memory, we try to find it in the DB
+    if (quoteNotFound && quote.id && quote.author) {
+      // We always look for the quote by sentAt timestamp, for opengroups, closed groups and session chats
+      // this will return an array of sent messages by id that we have locally.
+      const quotedMessagesCollection = await Data.getMessagesBySenderAndSentAt([
+        {
+          timestamp: toNumber(quote.id),
+          source: quote.author,
+        },
+      ]);
+
+      if (quotedMessagesCollection?.length) {
+        const quotedMessage = quotedMessagesCollection.at(0);
+        // If found, we navigate to the quoted message which also refreshes the message quote component
+        if (quotedMessage) {
+          conversationKey = String(quotedMessage.get('conversationId'));
+          messageIdToNavigateTo = String(quotedMessage.id);
         } else {
           quoteNotFoundInDB = true;
         }
+      } else {
+        quoteNotFoundInDB = true;
       }
-
-      // For simplicity's sake, we show the 'not found' toast no matter what if we were
-      // not able to find the referenced message when the quote was received or if the conversation no longer exists.
-      if (quoteNotFoundInDB) {
-        ToastUtils.pushOriginalNotFound();
-        return;
-      }
-
-      void openConversationToSpecificMessage({
-        conversationKey,
-        messageIdToNavigateTo,
-        shouldHighlightMessage: true,
-      });
-    },
-    [isMessageDetailViewMode, multiSelectMode, quote, quoteNotFound]
-  );
+    }
+
+    // For simplicity's sake, we show the 'not found' toast no matter what if we were
+    // not able to find the referenced message when the quote was received or if the conversation no longer exists.
+    if (quoteNotFoundInDB) {
+      ToastUtils.pushOriginalNotFound();
+      return;
+    }
+
+    void openConversationToSpecificMessage({
+      conversationKey,
+      messageIdToNavigateTo,
+      shouldHighlightMessage: true,
+    });
+  };
 
   return (
     <Quote
-      onClick={onQuoteClick}
+      onClick={e => void onQuoteClick(e)}
       text={quote?.text}
       attachment={quote?.attachment}
       isIncoming={direction === 'incoming'}
diff --git a/ts/components/conversation/message/message-content/MessageReactBar.tsx b/ts/components/conversation/message/message-content/MessageReactBar.tsx
index 68c2f2c256..34068ef0ab 100644
--- a/ts/components/conversation/message/message-content/MessageReactBar.tsx
+++ b/ts/components/conversation/message/message-content/MessageReactBar.tsx
@@ -1,10 +1,12 @@
-import React, { ReactElement, useEffect, useState } from 'react';
+import { isEqual } from 'lodash';
+import React, { ReactElement, useState } from 'react';
+import useMount from 'react-use/lib/useMount';
 import styled from 'styled-components';
+
+import { RecentReactions } from '../../../../types/Reaction';
+import { nativeEmojiData } from '../../../../util/emoji';
 import { getRecentReactions } from '../../../../util/storage';
 import { SessionIconButton } from '../../../icon';
-import { nativeEmojiData } from '../../../../util/emoji';
-import { isEqual } from 'lodash';
-import { RecentReactions } from '../../../../types/Reaction';
 
 type Props = {
   action: (...args: Array<any>) => void;
@@ -53,12 +55,12 @@ export const MessageReactBar = (props: Props): ReactElement => {
   const { action, additionalAction } = props;
   const [recentReactions, setRecentReactions] = useState<RecentReactions>();
 
-  useEffect(() => {
+  useMount(() => {
     const reactions = new RecentReactions(getRecentReactions());
     if (reactions && !isEqual(reactions, recentReactions)) {
       setRecentReactions(reactions);
     }
-  }, []);
+  });
 
   if (!recentReactions) {
     return <></>;
diff --git a/ts/components/conversation/message/message-content/Quote.tsx b/ts/components/conversation/message/message-content/Quote.tsx
index 7b8fb5b144..e2a29d634b 100644
--- a/ts/components/conversation/message/message-content/Quote.tsx
+++ b/ts/components/conversation/message/message-content/Quote.tsx
@@ -1,10 +1,10 @@
 import classNames from 'classnames';
 import React, { useState } from 'react';
+import { noop } from 'lodash';
 
-import * as MIME from '../../../../../ts/types/MIME';
-import * as GoogleChrome from '../../../../../ts/util/GoogleChrome';
+import * as MIME from '../../../../types/MIME';
+import * as GoogleChrome from '../../../../util/GoogleChrome';
 
-import { noop } from 'lodash';
 import { useDisableDrag } from '../../../../hooks/useDisableDrag';
 import { useEncryptedFileFetch } from '../../../../hooks/useEncryptedFileFetch';
 import { PubKey } from '../../../../session/types';
@@ -61,7 +61,7 @@ function getObjectUrl(thumbnail: Attachment | undefined): string | undefined {
     return thumbnail.objectUrl;
   }
 
-  return;
+  return undefined;
 }
 
 function getTypeLabel({
@@ -84,7 +84,7 @@ function getTypeLabel({
     return window.i18n('audio');
   }
 
-  return;
+  return undefined;
 }
 export const QuoteIcon = (props: any) => {
   const { icon } = props;
diff --git a/ts/components/conversation/message/message-content/quote/Quote.tsx b/ts/components/conversation/message/message-content/quote/Quote.tsx
index 76ddbe79cd..342ee705c0 100644
--- a/ts/components/conversation/message/message-content/quote/Quote.tsx
+++ b/ts/components/conversation/message/message-content/quote/Quote.tsx
@@ -1,13 +1,12 @@
 import React, { MouseEvent, useState } from 'react';
 
-import * as MIME from '../../../../../types/MIME';
-
 import { isEmpty } from 'lodash';
 import styled from 'styled-components';
 import { useIsMessageSelectionMode } from '../../../../../state/selectors/selectedConversation';
 import { QuoteAuthor } from './QuoteAuthor';
 import { QuoteIconContainer } from './QuoteIconContainer';
 import { QuoteText } from './QuoteText';
+import * as MIME from '../../../../../types/MIME';
 
 const StyledQuoteContainer = styled.div`
   min-width: 300px; // if the quoted content is small it doesn't look very good so we set a minimum
diff --git a/ts/components/conversation/message/message-content/quote/QuoteIconContainer.tsx b/ts/components/conversation/message/message-content/quote/QuoteIconContainer.tsx
index c568aab56b..e479a35629 100644
--- a/ts/components/conversation/message/message-content/quote/QuoteIconContainer.tsx
+++ b/ts/components/conversation/message/message-content/quote/QuoteIconContainer.tsx
@@ -1,11 +1,12 @@
 import React from 'react';
+import { isEmpty, noop } from 'lodash';
+import styled from 'styled-components';
+
 import { QuotedAttachmentThumbnailType, QuoteProps } from './Quote';
 import { GoogleChrome } from '../../../../../util';
 import { MIME } from '../../../../../types';
 
-import { isEmpty, noop } from 'lodash';
 import { QuoteImage } from './QuoteImage';
-import styled from 'styled-components';
 import { icons, SessionIconType } from '../../../../icon';
 
 function getObjectUrl(thumbnail: QuotedAttachmentThumbnailType | undefined): string | undefined {
@@ -13,7 +14,7 @@ function getObjectUrl(thumbnail: QuotedAttachmentThumbnailType | undefined): str
     return thumbnail.objectUrl;
   }
 
-  return;
+  return undefined;
 }
 
 const StyledQuoteIconContainer = styled.div`
diff --git a/ts/components/conversation/message/message-content/quote/QuoteImage.tsx b/ts/components/conversation/message/message-content/quote/QuoteImage.tsx
index 2eb4b51172..24b29ab545 100644
--- a/ts/components/conversation/message/message-content/quote/QuoteImage.tsx
+++ b/ts/components/conversation/message/message-content/quote/QuoteImage.tsx
@@ -1,9 +1,11 @@
 import React from 'react';
+import styled from 'styled-components';
+import { isEmpty } from 'lodash';
+
 import { useDisableDrag } from '../../../../../hooks/useDisableDrag';
 import { useEncryptedFileFetch } from '../../../../../hooks/useEncryptedFileFetch';
-import styled from 'styled-components';
+
 import { icons } from '../../../../icon';
-import { isEmpty } from 'lodash';
 import { QuoteIcon } from './QuoteIconContainer';
 
 const StyledQuoteImage = styled.div`
diff --git a/ts/components/conversation/message/message-item/GenericReadableMessage.tsx b/ts/components/conversation/message/message-item/GenericReadableMessage.tsx
index 37acd24d94..775dd84e7e 100644
--- a/ts/components/conversation/message/message-item/GenericReadableMessage.tsx
+++ b/ts/components/conversation/message/message-item/GenericReadableMessage.tsx
@@ -2,9 +2,11 @@ import classNames from 'classnames';
 import React, { useCallback, useEffect, useState } from 'react';
 import { contextMenu } from 'react-contexify';
 import { useDispatch, useSelector } from 'react-redux';
-// tslint:disable-next-line: no-submodule-imports
+import styled, { keyframes } from 'styled-components';
+
 import useInterval from 'react-use/lib/useInterval';
-import _ from 'lodash';
+import useMount from 'react-use/lib/useMount';
+
 import { Data } from '../../../../data/data';
 import { MessageRenderingProps } from '../../../../models/messageType';
 import { getConversationController } from '../../../../session/conversations';
@@ -17,11 +19,10 @@ import {
 import { getIncrement } from '../../../../util/timer';
 import { ExpireTimer } from '../../ExpireTimer';
 
-import { MessageContentWithStatuses } from '../message-content/MessageContentWithStatus';
-import { ReadableMessage } from './ReadableMessage';
-import styled, { keyframes } from 'styled-components';
 import { isOpenOrClosedGroup } from '../../../../models/conversationAttributes';
+import { MessageContentWithStatuses } from '../message-content/MessageContentWithStatus';
 import { StyledMessageReactionsContainer } from '../message-content/MessageReactions';
+import { ReadableMessage } from './ReadableMessage';
 
 export type GenericReadableMessageSelectorProps = Pick<
   MessageRenderingProps,
@@ -81,7 +82,7 @@ function useIsExpired(props: ExpiringProps) {
         convo?.updateLastMessage();
       }
     }
-  }, [expirationTimestamp, expirationLength, isExpired, messageId, convoId]);
+  }, [dispatch, expirationTimestamp, expirationLength, isExpired, messageId, convoId]);
 
   let checkFrequency: number | null = null;
   if (expirationLength) {
@@ -89,9 +90,9 @@ function useIsExpired(props: ExpiringProps) {
     checkFrequency = Math.max(EXPIRATION_CHECK_MINIMUM, increment);
   }
 
-  useEffect(() => {
+  useMount(() => {
     void checkExpired();
-  }, []); // check on mount
+  });
   useInterval(checkExpired, checkFrequency); // check every 2sec or sooner if needed
 
   return { isExpired };
@@ -102,7 +103,6 @@ type Props = {
   ctxMenuID: string;
   isDetailView?: boolean;
 };
-// tslint:disable: use-simple-attributes
 
 const highlightedMessageAnimation = keyframes`
   1% {
diff --git a/ts/components/conversation/message/message-item/GroupInvitation.tsx b/ts/components/conversation/message/message-item/GroupInvitation.tsx
index ca11c53fd4..efc31b1a19 100644
--- a/ts/components/conversation/message/message-item/GroupInvitation.tsx
+++ b/ts/components/conversation/message/message-item/GroupInvitation.tsx
@@ -1,10 +1,11 @@
-import React from 'react';
 import classNames from 'classnames';
-import { PropsForGroupInvitation } from '../../../../state/ducks/conversations';
+import React from 'react';
+import styled from 'styled-components';
+
 import { acceptOpenGroupInvitation } from '../../../../interactions/messageInteractions';
+import { PropsForGroupInvitation } from '../../../../state/ducks/conversations';
 import { SessionIconButton } from '../../../icon';
 import { ReadableMessage } from './ReadableMessage';
-import styled from 'styled-components';
 
 const StyledIconContainer = styled.div`
   background-color: var(--message-link-preview-background-color);
diff --git a/ts/components/conversation/message/message-item/GroupUpdateMessage.tsx b/ts/components/conversation/message/message-item/GroupUpdateMessage.tsx
index 92d6939a31..26761cbfe0 100644
--- a/ts/components/conversation/message/message-item/GroupUpdateMessage.tsx
+++ b/ts/components/conversation/message/message-item/GroupUpdateMessage.tsx
@@ -50,7 +50,6 @@ const ChangeItemLeft = (left: Array<string>): string => {
   return window.i18n(leftKey, [names.join(', ')]);
 };
 
-// tslint:disable-next-line: cyclomatic-complexity
 const ChangeItem = (change: PropsForGroupUpdateType): string => {
   const { type } = change;
   switch (type) {
@@ -69,6 +68,7 @@ const ChangeItem = (change: PropsForGroupUpdateType): string => {
       return window.i18n('updatedTheGroup');
     default:
       assertUnreachable(type, `ChangeItem: Missing case error "${type}"`);
+      return '';
   }
 };
 
diff --git a/ts/components/conversation/message/message-item/Message.tsx b/ts/components/conversation/message/message-item/Message.tsx
index bfa0778dbf..35af3ed0ca 100644
--- a/ts/components/conversation/message/message-item/Message.tsx
+++ b/ts/components/conversation/message/message-item/Message.tsx
@@ -1,11 +1,10 @@
 import React from 'react';
 
-import _ from 'lodash';
-import { v4 as uuidv4 } from 'uuid';
 import { useSelector } from 'react-redux';
+import { v4 as uuidv4 } from 'uuid';
 import { getGenericReadableMessageSelectorProps } from '../../../../state/selectors/conversations';
-import { GenericReadableMessage } from './GenericReadableMessage';
 import { THUMBNAIL_SIDE } from '../../../../types/attachments/VisualAttachment';
+import { GenericReadableMessage } from './GenericReadableMessage';
 
 // Same as MIN_WIDTH in ImageGrid.tsx
 export const MINIMUM_LINK_PREVIEW_IMAGE_WIDTH = THUMBNAIL_SIDE;
diff --git a/ts/components/conversation/message/message-item/MessageDetail.tsx b/ts/components/conversation/message/message-item/MessageDetail.tsx
index 4933ad74aa..24653ca38a 100644
--- a/ts/components/conversation/message/message-item/MessageDetail.tsx
+++ b/ts/components/conversation/message/message-item/MessageDetail.tsx
@@ -1,21 +1,22 @@
-import React from 'react';
 import classNames from 'classnames';
 import moment from 'moment';
+import React from 'react';
+import { useDispatch, useSelector } from 'react-redux';
+import useKey from 'react-use/lib/useKey';
 
 import { Message } from './Message';
-import { useDispatch, useSelector } from 'react-redux';
-import { Avatar, AvatarSize } from '../../../avatar/Avatar';
+
 import { deleteMessagesById } from '../../../../interactions/conversations/unsendingInteractions';
 import {
-  closeMessageDetailsView,
   ContactPropsMessageDetail,
+  closeMessageDetailsView,
 } from '../../../../state/ducks/conversations';
 import { getMessageDetailsViewProps } from '../../../../state/selectors/conversations';
+import { Avatar, AvatarSize } from '../../../avatar/Avatar';
 import { ContactName } from '../../ContactName';
-// tslint:disable-next-line: no-submodule-imports
-import useKey from 'react-use/lib/useKey';
-import { SessionButton, SessionButtonColor, SessionButtonType } from '../../../basic/SessionButton';
+
 import { useMessageIsDeletable } from '../../../../state/selectors';
+import { SessionButton, SessionButtonColor, SessionButtonType } from '../../../basic/SessionButton';
 
 const AvatarItem = (props: { pubkey: string }) => {
   const { pubkey } = props;
diff --git a/ts/components/conversation/message/message-item/ReadableMessage.tsx b/ts/components/conversation/message/message-item/ReadableMessage.tsx
index f97480dec4..b3abc292d6 100644
--- a/ts/components/conversation/message/message-item/ReadableMessage.tsx
+++ b/ts/components/conversation/message/message-item/ReadableMessage.tsx
@@ -13,7 +13,6 @@ import {
 } from '../../../../state/ducks/conversations';
 import {
   areMoreMessagesBeingFetched,
-  getLoadedMessagesLength,
   getMostRecentMessageId,
   getOldestMessageId,
   getQuotedMessageToAnimate,
@@ -64,7 +63,6 @@ export const ReadableMessage = (props: ReadableMessageProps) => {
   const dispatch = useDispatch();
 
   const selectedConversationKey = useSelectedConversationKey();
-  const loadedMessagesLength = useSelector(getLoadedMessagesLength);
   const mostRecentMessageId = useSelector(getMostRecentMessageId);
   const oldestMessageId = useSelector(getOldestMessageId);
   const youngestMessageId = useSelector(getYoungestMessageId);
@@ -80,6 +78,7 @@ export const ReadableMessage = (props: ReadableMessageProps) => {
   // if this unread-indicator is rendered,
   // we want to scroll here only if the conversation was not opened to a specific message
 
+  // eslint-disable-next-line react-hooks/exhaustive-deps
   useLayoutEffect(() => {
     if (
       props.messageId === youngestMessageId &&
@@ -96,8 +95,7 @@ export const ReadableMessage = (props: ReadableMessageProps) => {
   });
 
   const onVisible = useCallback(
-    // tslint:disable-next-line: cyclomatic-complexity
-    async (inView: boolean | Object) => {
+    async (inView: boolean | object) => {
       if (!selectedConversationKey) {
         return;
       }
@@ -160,20 +158,20 @@ export const ReadableMessage = (props: ReadableMessageProps) => {
       }
     },
     [
+      dispatch,
       selectedConversationKey,
       mostRecentMessageId,
       oldestMessageId,
       fetchingMoreInProgress,
       isAppFocused,
-      loadedMessagesLength,
       receivedAt,
       messageId,
       isUnread,
+      youngestMessageId,
     ]
   );
 
   return (
-    // tslint:disable-next-line: use-simple-attributes
     <InView
       id={`msg-${messageId}`}
       onContextMenu={onContextMenu}
diff --git a/ts/components/conversation/message/reactions/Reaction.tsx b/ts/components/conversation/message/reactions/Reaction.tsx
index 124e57680d..f0445a8c08 100644
--- a/ts/components/conversation/message/reactions/Reaction.tsx
+++ b/ts/components/conversation/message/reactions/Reaction.tsx
@@ -52,7 +52,6 @@ export type ReactionProps = {
   handlePopupReaction?: (emoji: string) => void;
   handlePopupClick?: () => void;
 };
-// tslint:disable-next-line: use-simple-attributes
 
 export const Reaction = (props: ReactionProps): ReactElement => {
   const {
diff --git a/ts/components/conversation/message/reactions/ReactionPopup.tsx b/ts/components/conversation/message/reactions/ReactionPopup.tsx
index 23082b0957..cefd352cf6 100644
--- a/ts/components/conversation/message/reactions/ReactionPopup.tsx
+++ b/ts/components/conversation/message/reactions/ReactionPopup.tsx
@@ -99,8 +99,8 @@ const generateContactsString = async (
 const Contacts = (contacts: Array<string>, count: number) => {
   const darkMode = useSelector(isDarkTheme);
 
-  if (!Boolean(contacts?.length > 0)) {
-    return;
+  if (!(contacts?.length > 0)) {
+    return null;
   }
 
   const reactors = contacts.length;
@@ -118,7 +118,8 @@ const Contacts = (contacts: Array<string>, count: number) => {
         <span>{window.i18n('reactionPopup')}</span>
       </StyledContacts>
     );
-  } else if (reactors > 3) {
+  }
+  if (reactors > 3) {
     return (
       <StyledContacts>
         {window.i18n('reactionPopupMany', [contacts[0], contacts[1], contacts[3]])}{' '}
@@ -128,9 +129,8 @@ const Contacts = (contacts: Array<string>, count: number) => {
         <span>{window.i18n('reactionPopup')}</span>
       </StyledContacts>
     );
-  } else {
-    return null;
   }
+  return null;
 };
 
 type Props = {
@@ -149,6 +149,7 @@ export const ReactionPopup = (props: Props): ReactElement => {
 
   useEffect(() => {
     let isCancelled = false;
+    // eslint-disable-next-line more/no-then
     generateContactsString(messageId, senders)
       .then(async results => {
         if (isCancelled) {
@@ -158,11 +159,7 @@ export const ReactionPopup = (props: Props): ReactElement => {
           setContacts(results);
         }
       })
-      .catch(() => {
-        if (isCancelled) {
-          return;
-        }
-      });
+      .catch(() => {});
 
     return () => {
       isCancelled = true;
diff --git a/ts/components/dialog/BanOrUnbanUserDialog.tsx b/ts/components/dialog/BanOrUnbanUserDialog.tsx
index 02ed38b939..41348238cc 100644
--- a/ts/components/dialog/BanOrUnbanUserDialog.tsx
+++ b/ts/components/dialog/BanOrUnbanUserDialog.tsx
@@ -1,25 +1,24 @@
 import React, { useRef, useState } from 'react';
-import { PubKey } from '../../session/types';
-import { ToastUtils } from '../../session/utils';
-import { Flex } from '../basic/Flex';
 import { useDispatch, useSelector } from 'react-redux';
-import { BanType, updateBanOrUnbanUserModal } from '../../state/ducks/modalDialog';
-import { SpacerSM } from '../basic/Text';
-import { getConversationController } from '../../session/conversations/ConversationController';
-import { SessionWrapperModal } from '../SessionWrapperModal';
-import { SessionSpinner } from '../basic/SessionSpinner';
-import { SessionButton, SessionButtonColor, SessionButtonType } from '../basic/SessionButton';
-import { ConversationModel } from '../../models/conversation';
+
 import { useFocusMount } from '../../hooks/useFocusMount';
 import { useConversationPropsById } from '../../hooks/useParamSelector';
+import { ConversationModel } from '../../models/conversation';
 import {
   sogsV3BanUser,
   sogsV3UnbanUser,
 } from '../../session/apis/open_group_api/sogsv3/sogsV3BanUnban';
-import { SessionHeaderSearchInput } from '../SessionHeaderSearchInput';
+import { getConversationController } from '../../session/conversations/ConversationController';
+import { PubKey } from '../../session/types';
+import { ToastUtils } from '../../session/utils';
+import { BanType, updateBanOrUnbanUserModal } from '../../state/ducks/modalDialog';
 import { isDarkTheme } from '../../state/selectors/theme';
-
-// tslint:disable: use-simple-attributes
+import { SessionHeaderSearchInput } from '../SessionHeaderSearchInput';
+import { SessionWrapperModal } from '../SessionWrapperModal';
+import { Flex } from '../basic/Flex';
+import { SessionButton, SessionButtonColor, SessionButtonType } from '../basic/SessionButton';
+import { SessionSpinner } from '../basic/SessionSpinner';
+import { SpacerSM } from '../basic/Text';
 
 async function banOrUnBanUserCall(
   convo: ConversationModel,
@@ -45,10 +44,12 @@ async function banOrUnBanUserCall(
     if (!isChangeApplied) {
       window?.log?.warn(`failed to ${banType} user: ${isChangeApplied}`);
 
+      // eslint-disable-next-line no-unused-expressions
       banType === 'ban' ? ToastUtils.pushUserBanFailure() : ToastUtils.pushUserUnbanSuccess();
       return false;
     }
     window?.log?.info(`${pubkey.key} user ${banType}ned successfully...`);
+    // eslint-disable-next-line no-unused-expressions
     banType === 'ban' ? ToastUtils.pushUserBanSuccess() : ToastUtils.pushUserUnbanSuccess();
     return true;
   } catch (e) {
diff --git a/ts/components/dialog/DeleteAccountModal.tsx b/ts/components/dialog/DeleteAccountModal.tsx
index 6a605ebc35..d91829143a 100644
--- a/ts/components/dialog/DeleteAccountModal.tsx
+++ b/ts/components/dialog/DeleteAccountModal.tsx
@@ -211,7 +211,7 @@ export const DeleteAccountModal = () => {
    */
   const onClickCancelHandler = useCallback(() => {
     dispatch(updateDeleteAccountModal(null));
-  }, []);
+  }, [dispatch]);
 
   return (
     <SessionWrapperModal
diff --git a/ts/components/dialog/EditProfileDialog.tsx b/ts/components/dialog/EditProfileDialog.tsx
index 34d4947a14..32e4e2d8a0 100644
--- a/ts/components/dialog/EditProfileDialog.tsx
+++ b/ts/components/dialog/EditProfileDialog.tsx
@@ -1,6 +1,7 @@
+import autoBind from 'auto-bind';
 import React, { ChangeEvent, MouseEvent } from 'react';
 import { QRCode } from 'react-qr-svg';
-
+import styled from 'styled-components';
 import { Avatar, AvatarSize } from '../avatar/Avatar';
 
 import { SyncUtils, ToastUtils, UserUtils } from '../../session/utils';
@@ -8,8 +9,6 @@ import { YourSessionIDPill, YourSessionIDSelectable } from '../basic/YourSession
 
 import { ConversationModel } from '../../models/conversation';
 
-import autoBind from 'auto-bind';
-import styled from 'styled-components';
 import { uploadOurAvatar } from '../../interactions/conversationInteractions';
 import { ConversationTypeEnum } from '../../models/conversationAttributes';
 import { MAX_USERNAME_BYTES } from '../../session/constants';
@@ -60,10 +59,10 @@ interface State {
   loading: boolean;
 }
 
-export class EditProfileDialog extends React.Component<{}, State> {
+export class EditProfileDialog extends React.Component<object, State> {
   private readonly convo: ConversationModel;
 
-  constructor(props: any) {
+  constructor(props: object) {
     super(props);
 
     autoBind(this);
@@ -164,7 +163,7 @@ export class EditProfileDialog extends React.Component<{}, State> {
             <div
               className="image-upload-section"
               role="button"
-              onClick={this.fireInputEvent}
+              onClick={() => void this.fireInputEvent()}
               data-testid="image-upload-section"
             />
             <div
@@ -303,6 +302,7 @@ export class EditProfileDialog extends React.Component<{}, State> {
           profileName: trimName,
           loading: true,
         },
+        // eslint-disable-next-line @typescript-eslint/no-misused-promises
         async () => {
           await commitProfileEdits(newName, newAvatarObjectUrl);
           this.setState({
@@ -315,8 +315,6 @@ export class EditProfileDialog extends React.Component<{}, State> {
       );
     } catch (e) {
       ToastUtils.pushToastError('nameTooLong', window.i18n('displayNameTooLong'));
-
-      return;
     }
   }
 
diff --git a/ts/components/dialog/InviteContactsDialog.tsx b/ts/components/dialog/InviteContactsDialog.tsx
index f2d97abe35..0d0bedbe74 100644
--- a/ts/components/dialog/InviteContactsDialog.tsx
+++ b/ts/components/dialog/InviteContactsDialog.tsx
@@ -1,4 +1,5 @@
 import React from 'react';
+import useKey from 'react-use/lib/useKey';
 
 import _ from 'lodash';
 import { useDispatch, useSelector } from 'react-redux';
@@ -8,16 +9,15 @@ import { getConversationController } from '../../session/conversations';
 import { ToastUtils, UserUtils } from '../../session/utils';
 import { updateInviteContactModal } from '../../state/ducks/modalDialog';
 import { SpacerLG } from '../basic/Text';
-// tslint:disable-next-line: no-submodule-imports
-import useKey from 'react-use/lib/useKey';
+
 import { useConversationPropsById } from '../../hooks/useParamSelector';
 import { useSet } from '../../hooks/useSet';
 import { initiateClosedGroupUpdate } from '../../session/group/closed-group';
+import { SessionUtilUserGroups } from '../../session/utils/libsession/libsession_utils_user_groups';
 import { getPrivateContactsPubkeys } from '../../state/selectors/conversations';
-import { SessionButton, SessionButtonColor, SessionButtonType } from '../basic/SessionButton';
 import { MemberListItem } from '../MemberListItem';
 import { SessionWrapperModal } from '../SessionWrapperModal';
-import { SessionUtilUserGroups } from '../../session/utils/libsession/libsession_utils_user_groups';
+import { SessionButton, SessionButtonColor, SessionButtonType } from '../basic/SessionButton';
 
 type Props = {
   conversationId: string;
@@ -37,6 +37,7 @@ async function submitForOpenGroup(convoId: string, pubkeys: Array<string>) {
       url: roomDetails?.fullUrlWithPubkey,
       name: convo.getNicknameOrRealUsernameOrPlaceholder(),
     };
+    // eslint-disable-next-line @typescript-eslint/no-misused-promises
     pubkeys.forEach(async pubkeyStr => {
       const privateConvo = await getConversationController().getOrCreateAndWait(
         pubkeyStr,
@@ -96,7 +97,6 @@ const submitForClosedGroup = async (convoId: string, pubkeys: Array<string>) =>
   }
 };
 
-// tslint:disable-next-line: max-func-body-length
 const InviteContactsDialogInner = (props: Props) => {
   const { conversationId } = props;
   const dispatch = useDispatch();
diff --git a/ts/components/dialog/ModeratorsAddDialog.tsx b/ts/components/dialog/ModeratorsAddDialog.tsx
index 0aa694a5f1..b8b3b3b35d 100644
--- a/ts/components/dialog/ModeratorsAddDialog.tsx
+++ b/ts/components/dialog/ModeratorsAddDialog.tsx
@@ -1,9 +1,10 @@
 import React, { useState } from 'react';
+import { useDispatch, useSelector } from 'react-redux';
+
 import { PubKey } from '../../session/types';
 import { ToastUtils } from '../../session/utils';
 import { Flex } from '../basic/Flex';
 import { getConversationController } from '../../session/conversations';
-import { useDispatch, useSelector } from 'react-redux';
 import { updateAddModeratorsModal } from '../../state/ducks/modalDialog';
 import { SessionButton, SessionButtonType } from '../basic/SessionButton';
 import { SessionSpinner } from '../basic/SessionSpinner';
@@ -39,10 +40,10 @@ export const AddModeratorsDialog = (props: Props) => {
 
     try {
       setAddingInProgress(true);
-      let isAdded: any;
+
       // this is a v2 opengroup
       const roomInfos = convo.toOpenGroupV2();
-      isAdded = await sogsV3AddAdmin([pubkey], roomInfos);
+      const isAdded = await sogsV3AddAdmin([pubkey], roomInfos);
 
       if (!isAdded) {
         window?.log?.warn('failed to add moderators:', isAdded);
diff --git a/ts/components/dialog/ModeratorsRemoveDialog.tsx b/ts/components/dialog/ModeratorsRemoveDialog.tsx
index 61a82c50ad..7436b0edae 100644
--- a/ts/components/dialog/ModeratorsRemoveDialog.tsx
+++ b/ts/components/dialog/ModeratorsRemoveDialog.tsx
@@ -1,15 +1,17 @@
 import React, { useState } from 'react';
+import { compact } from 'lodash';
+import { useDispatch } from 'react-redux';
+
 import { getConversationController } from '../../session/conversations';
 import { PubKey } from '../../session/types';
 import { ToastUtils } from '../../session/utils';
 import { Flex } from '../basic/Flex';
-import { compact } from 'lodash';
+
 import { updateRemoveModeratorsModal } from '../../state/ducks/modalDialog';
 import { SessionWrapperModal } from '../SessionWrapperModal';
 import { SessionButton, SessionButtonColor, SessionButtonType } from '../basic/SessionButton';
 import { SessionSpinner } from '../basic/SessionSpinner';
 import { MemberListItem } from '../MemberListItem';
-import { useDispatch } from 'react-redux';
 import { useConversationPropsById } from '../../hooks/useParamSelector';
 import { sogsV3RemoveAdmins } from '../../session/apis/open_group_api/sogsv3/sogsV3AddRemoveMods';
 
@@ -25,23 +27,21 @@ async function removeMods(convoId: string, modsToRemove: Array<string>) {
   window?.log?.info(`asked to remove moderators: ${modsToRemove}`);
 
   try {
-    let res;
     const convo = getConversationController().get(convoId);
 
     const roomInfos = convo.toOpenGroupV2();
     const modsToRemovePubkey = compact(modsToRemove.map(m => PubKey.from(m)));
-    res = await sogsV3RemoveAdmins(modsToRemovePubkey, roomInfos);
+    const res = await sogsV3RemoveAdmins(modsToRemovePubkey, roomInfos);
 
     if (!res) {
       window?.log?.warn('failed to remove moderators:', res);
 
       ToastUtils.pushFailedToRemoveFromModerator();
       return false;
-    } else {
-      window?.log?.info(`${modsToRemove} removed from moderators...`);
-      ToastUtils.pushUserRemovedFromModerators();
-      return true;
     }
+    window?.log?.info(`${modsToRemove} removed from moderators...`);
+    ToastUtils.pushUserRemovedFromModerators();
+    return true;
   } catch (e) {
     window?.log?.error('Got error while removing moderator:', e);
     return false;
diff --git a/ts/components/dialog/OnionStatusPathDialog.tsx b/ts/components/dialog/OnionStatusPathDialog.tsx
index 1566424e79..c966697b9f 100644
--- a/ts/components/dialog/OnionStatusPathDialog.tsx
+++ b/ts/components/dialog/OnionStatusPathDialog.tsx
@@ -3,9 +3,11 @@ import React from 'react';
 import { shell } from 'electron';
 
 import { useDispatch, useSelector } from 'react-redux';
+import useHover from 'react-use/lib/useHover';
+import styled from 'styled-components';
 
-import ip2country from 'ip2country';
 import countryLookup from 'country-code-lookup';
+import ip2country from 'ip2country';
 import { Snode } from '../../data/data';
 import { onionPathModal } from '../../state/ducks/modalDialog';
 import {
@@ -15,12 +17,10 @@ import {
   getOnionPathsCount,
 } from '../../state/selectors/onions';
 import { Flex } from '../basic/Flex';
-// tslint:disable-next-line: no-submodule-imports
-import useHover from 'react-use/lib/useHover';
+
 import { SessionSpinner } from '../basic/SessionSpinner';
 import { SessionIcon, SessionIconButton } from '../icon';
 import { SessionWrapperModal } from '../SessionWrapperModal';
-import styled from 'styled-components';
 
 export type StatusLightType = {
   glowStartDelay: number;
@@ -202,7 +202,7 @@ export const ActionPanelOnionStatusLight = (props: {
 
   // start with red
   let iconColor = errorColor;
-  //if we are not online or the first path is not valid, we keep red as color
+  // if we are not online or the first path is not valid, we keep red as color
   if (isOnline && firstPathLength > 1) {
     iconColor =
       onionPathsCount >= 2 ? defaultColor : onionPathsCount >= 1 ? connectingColor : errorColor;
@@ -230,7 +230,6 @@ export const OnionPathModal = () => {
   };
   const dispatch = useDispatch();
   return (
-    // tslint:disable-next-line: use-simple-attributes
     <SessionWrapperModal
       title={window.i18n('onionPathIndicatorTitle')}
       confirmText={window.i18n('learnMore')}
diff --git a/ts/components/dialog/ReactClearAllModal.tsx b/ts/components/dialog/ReactClearAllModal.tsx
index 94a6d8bd39..fa3a07b6e5 100644
--- a/ts/components/dialog/ReactClearAllModal.tsx
+++ b/ts/components/dialog/ReactClearAllModal.tsx
@@ -46,7 +46,6 @@ const StyledReactClearAllContainer = styled(Flex)`
   }
 `;
 
-// tslint:disable-next-line: max-func-body-length
 export const ReactClearAllModal = (props: Props): ReactElement => {
   const { reaction, messageId } = props;
 
diff --git a/ts/components/dialog/ReactListModal.tsx b/ts/components/dialog/ReactListModal.tsx
index aa7beb9a6b..b6ac1c8408 100644
--- a/ts/components/dialog/ReactListModal.tsx
+++ b/ts/components/dialog/ReactListModal.tsx
@@ -1,5 +1,5 @@
 import { isEmpty, isEqual } from 'lodash';
-import React, { ReactElement, useEffect, useState } from 'react';
+import React, { ReactElement, useEffect, useMemo, useState } from 'react';
 import { useDispatch } from 'react-redux';
 import styled from 'styled-components';
 import { Data } from '../../data/data';
@@ -136,8 +136,8 @@ const ReactionSenders = (props: ReactionSendersProps) => {
             <Avatar
               size={AvatarSize.XS}
               pubkey={sender}
-              onAvatarClick={async () => {
-                await handleAvatarClick(sender);
+              onAvatarClick={() => {
+                void handleAvatarClick(sender);
               }}
             />
             {sender === me ? (
@@ -154,8 +154,8 @@ const ReactionSenders = (props: ReactionSendersProps) => {
             <SessionIconButton
               iconType="exit"
               iconSize="small"
-              onClick={async () => {
-                await handleRemoveReaction();
+              onClick={() => {
+                void handleRemoveReaction();
               }}
             />
           )}
@@ -174,7 +174,6 @@ const StyledCountText = styled.p`
     color: var(--text-primary);
   }
 `;
-// tslint:disable: use-simple-attributes
 
 const CountText = ({ count, emoji }: { count: number; emoji: string }) => {
   return (
@@ -219,13 +218,12 @@ const handleSenders = (senders: Array<string>, me: string) => {
   return updatedSenders;
 };
 
-// tslint:disable-next-line: max-func-body-length
 export const ReactListModal = (props: Props): ReactElement => {
   const { reaction, messageId } = props;
 
   const dispatch = useDispatch();
   const [reactions, setReactions] = useState<SortedReactionList>([]);
-  const reactionsMap = (reactions && Object.fromEntries(reactions)) || {};
+
   const [currentReact, setCurrentReact] = useState('');
   const [reactAriaLabel, setReactAriaLabel] = useState<string | undefined>();
   const [count, setCount] = useState<number | null>(null);
@@ -236,7 +234,12 @@ export const ReactListModal = (props: Props): ReactElement => {
   const weAreModerator = useSelectedWeAreModerator();
   const me = UserUtils.getOurPubKeyStrFromCache();
 
-  // tslint:disable: cyclomatic-complexity
+  const reactionsMap = useMemo(() => {
+    return (reactions && Object.fromEntries(reactions)) || {};
+  }, [reactions]);
+  const reactionsCount = reactionsMap[currentReact]?.count;
+
+  // TODO we should break down this useEffect, it is hard to read.
   useEffect(() => {
     if (currentReact === '' && currentReact !== reaction) {
       setReactAriaLabel(
@@ -278,7 +281,7 @@ export const ReactListModal = (props: Props): ReactElement => {
       setSenders([]);
     }
 
-    if (reactionsMap[currentReact]?.count && count !== reactionsMap[currentReact]?.count) {
+    if (reactionsCount && count !== reactionsCount) {
       setCount(reactionsMap[currentReact].count);
     }
   }, [
@@ -286,10 +289,11 @@ export const ReactListModal = (props: Props): ReactElement => {
     currentReact,
     me,
     reaction,
-    reactionsMap[currentReact]?.count,
+    reactionsCount,
     msgProps?.sortedReacts,
     reactionsMap,
     senders,
+    reactions,
   ]);
 
   if (!msgProps) {
diff --git a/ts/components/dialog/SessionConfirm.tsx b/ts/components/dialog/SessionConfirm.tsx
index 0169d3f2a1..c5987d81fd 100644
--- a/ts/components/dialog/SessionConfirm.tsx
+++ b/ts/components/dialog/SessionConfirm.tsx
@@ -1,14 +1,14 @@
+import { Dispatch } from '@reduxjs/toolkit';
+import { shell } from 'electron';
 import React, { useState } from 'react';
-import { SessionHtmlRenderer } from '../basic/SessionHTMLRenderer';
+import { MessageInteraction } from '../../interactions';
 import { updateConfirmModal } from '../../state/ducks/modalDialog';
-import { SpacerLG } from '../basic/Text';
+import { SessionWrapperModal } from '../SessionWrapperModal';
 import { SessionButton, SessionButtonColor, SessionButtonType } from '../basic/SessionButton';
+import { SessionHtmlRenderer } from '../basic/SessionHTMLRenderer';
 import { SessionSpinner } from '../basic/SessionSpinner';
+import { SpacerLG } from '../basic/Text';
 import { SessionIcon, SessionIconSize, SessionIconType } from '../icon';
-import { SessionWrapperModal } from '../SessionWrapperModal';
-import { Dispatch } from '@reduxjs/toolkit';
-import { shell } from 'electron';
-import { MessageInteraction } from '../../interactions';
 
 export interface SessionConfirmDialogProps {
   message?: string;
diff --git a/ts/components/dialog/SessionModal.tsx b/ts/components/dialog/SessionModal.tsx
deleted file mode 100644
index dafe1f05b2..0000000000
--- a/ts/components/dialog/SessionModal.tsx
+++ /dev/null
@@ -1,136 +0,0 @@
-import React from 'react';
-import classNames from 'classnames';
-import { SessionButtonColor, SessionButtonType } from '../basic/SessionButton';
-import { SessionIconButton, SessionIconType } from '../icon';
-
-interface Props {
-  title: string;
-  onClose: any;
-  showExitIcon?: boolean;
-  showHeader?: boolean;
-  headerReverse?: boolean;
-  //Maximum of two icons or buttons in header
-  headerIconButtons?: Array<{
-    iconType: SessionIconType;
-    iconRotation: number;
-    onClick?: any;
-  }>;
-  headerButtons?: Array<{
-    buttonType: SessionButtonType;
-    buttonColor: SessionButtonColor;
-    text: string;
-    onClick?: any;
-  }>;
-}
-
-interface State {
-  isVisible: boolean;
-}
-
-// NOTE This is currently unused.
-export class SessionModal extends React.PureComponent<Props, State> {
-  public static defaultProps = {
-    showExitIcon: true,
-    showHeader: true,
-    headerReverse: false,
-  };
-
-  private node: HTMLDivElement | null;
-
-  constructor(props: any) {
-    super(props);
-    this.state = {
-      isVisible: true,
-    };
-
-    this.close = this.close.bind(this);
-    this.onKeyUp = this.onKeyUp.bind(this);
-    this.node = null;
-  }
-
-  public componentDidMount() {
-    window.addEventListener('keyup', this.onKeyUp);
-
-    document.addEventListener('mousedown', this.handleClick, false);
-  }
-
-  public componentWillUnmount() {
-    window.removeEventListener('keyup', this.onKeyUp);
-
-    document.removeEventListener('mousedown', this.handleClick, false);
-  }
-
-  public handleClick = (e: any) => {
-    if (this.node && this.node.contains(e.target)) {
-      return;
-    }
-
-    this.close();
-  };
-
-  public render() {
-    const { title, headerIconButtons, showExitIcon, showHeader, headerReverse } = this.props;
-    const { isVisible } = this.state;
-
-    return isVisible ? (
-      <div ref={node => (this.node = node)} className={'session-modal'}>
-        {showHeader ? (
-          <>
-            <div className={classNames('session-modal__header', headerReverse && 'reverse')}>
-              <div className="session-modal__header__close">
-                {showExitIcon ? (
-                  <SessionIconButton
-                    iconType="exit"
-                    iconSize="small"
-                    onClick={this.close}
-                    dataTestId="modal-close-button"
-                  />
-                ) : null}
-              </div>
-              <div className="session-modal__header__title">{title}</div>
-              <div className="session-modal__header__icons">
-                {headerIconButtons
-                  ? headerIconButtons.map((iconItem: any) => {
-                      return (
-                        <SessionIconButton
-                          key={iconItem.iconType}
-                          iconType={iconItem.iconType}
-                          iconSize={'large'}
-                          iconRotation={iconItem.iconRotation}
-                          onClick={iconItem.onClick}
-                        />
-                      );
-                    })
-                  : null}
-              </div>
-            </div>
-          </>
-        ) : null}
-
-        <div className="session-modal__body">{this.props.children}</div>
-      </div>
-    ) : null;
-  }
-
-  public close() {
-    this.setState({
-      isVisible: false,
-    });
-
-    document.removeEventListener('mousedown', this.handleClick, false);
-
-    if (this.props.onClose) {
-      this.props.onClose();
-    }
-  }
-
-  public onKeyUp(event: any) {
-    switch (event.key) {
-      case 'Esc':
-      case 'Escape':
-        this.close();
-        break;
-      default:
-    }
-  }
-}
diff --git a/ts/components/dialog/SessionNicknameDialog.tsx b/ts/components/dialog/SessionNicknameDialog.tsx
index 69f4b65d83..008d341854 100644
--- a/ts/components/dialog/SessionNicknameDialog.tsx
+++ b/ts/components/dialog/SessionNicknameDialog.tsx
@@ -1,9 +1,10 @@
 import React, { useState } from 'react';
+import _ from 'lodash';
+import { useDispatch } from 'react-redux';
+
 import { getConversationController } from '../../session/conversations';
 
-import _ from 'lodash';
 import { SpacerLG } from '../basic/Text';
-import { useDispatch } from 'react-redux';
 import { changeNickNameModal } from '../../state/ducks/modalDialog';
 import { SessionButton, SessionButtonColor, SessionButtonType } from '../basic/SessionButton';
 import { SessionWrapperModal } from '../SessionWrapperModal';
diff --git a/ts/components/dialog/SessionPasswordDialog.tsx b/ts/components/dialog/SessionPasswordDialog.tsx
index dcb94b658f..1eafcf5382 100644
--- a/ts/components/dialog/SessionPasswordDialog.tsx
+++ b/ts/components/dialog/SessionPasswordDialog.tsx
@@ -1,9 +1,10 @@
+/* eslint-disable @typescript-eslint/no-misused-promises */
 import React from 'react';
+import autoBind from 'auto-bind';
 
 import { ToastUtils } from '../../session/utils';
 import { Data } from '../../data/data';
 import { SpacerSM } from '../basic/Text';
-import autoBind from 'auto-bind';
 import { sessionPassword } from '../../state/ducks/modalDialog';
 import { LocalizerKeys } from '../../types/LocalizerKeys';
 import { SessionButton, SessionButtonColor, SessionButtonType } from '../basic/SessionButton';
@@ -45,8 +46,7 @@ export class SessionPasswordDialog extends React.Component<Props, State> {
     document.addEventListener('keyup', this.onEnterPressed);
 
     setTimeout(() => {
-      // tslint:disable-next-line: no-unused-expression
-      this.passportInput && this.passportInput.focus();
+      this.passportInput?.focus();
     }, 1);
   }
 
@@ -270,7 +270,7 @@ export class SessionPasswordDialog extends React.Component<Props, State> {
   private async onEnterPressed(event: any) {
     if (event.key === 'Enter') {
       event.stopPropagation();
-      return this.setPassword();
+      await this.setPassword();
     }
   }
 
@@ -293,7 +293,6 @@ export class SessionPasswordDialog extends React.Component<Props, State> {
     this.closeDialog();
   }
 
-  // tslint:disable-next-line: cyclomatic-complexity
   private async setPassword() {
     const { passwordAction } = this.props;
     const {
diff --git a/ts/components/dialog/SessionSeedModal.tsx b/ts/components/dialog/SessionSeedModal.tsx
index 1b78900dbb..ba6eba3a08 100644
--- a/ts/components/dialog/SessionSeedModal.tsx
+++ b/ts/components/dialog/SessionSeedModal.tsx
@@ -1,18 +1,21 @@
-import React, { MouseEvent, useEffect, useState } from 'react';
+import React, { MouseEvent, useState } from 'react';
+import { QRCode } from 'react-qr-svg';
+import { useDispatch } from 'react-redux';
+import useMount from 'react-use/lib/useMount';
+import styled from 'styled-components';
 
+import { Data } from '../../data/data';
 import { ToastUtils } from '../../session/utils';
 import { matchesHash } from '../../util/passwordUtils';
-import { Data } from '../../data/data';
-import { QRCode } from 'react-qr-svg';
-import { mn_decode } from '../../session/crypto/mnemonic';
-import { SpacerSM } from '../basic/Text';
+
+import { mnDecode } from '../../session/crypto/mnemonic';
 import { recoveryPhraseModal } from '../../state/ducks/modalDialog';
-import { useDispatch } from 'react-redux';
-import { SessionButton, SessionButtonColor, SessionButtonType } from '../basic/SessionButton';
-import { SessionWrapperModal } from '../SessionWrapperModal';
-import { getCurrentRecoveryPhrase } from '../../util/storage';
-import styled from 'styled-components';
+import { SpacerSM } from '../basic/Text';
+
 import { saveQRCode } from '../../util/saveQRCode';
+import { getCurrentRecoveryPhrase } from '../../util/storage';
+import { SessionWrapperModal } from '../SessionWrapperModal';
+import { SessionButton, SessionButtonColor, SessionButtonType } from '../basic/SessionButton';
 
 interface PasswordProps {
   setPasswordValid: (val: boolean) => any;
@@ -117,7 +120,7 @@ const Seed = (props: SeedProps) => {
   const fgColor = 'var(--black-color)';
   const dispatch = useDispatch();
 
-  const hexEncodedSeed = mn_decode(recoveryPhrase, 'english');
+  const hexEncodedSeed = mnDecode(recoveryPhrase, 'english');
 
   const copyRecoveryPhrase = (recoveryPhraseToCopy: string) => {
     window.clipboard.writeText(recoveryPhraseToCopy);
@@ -193,43 +196,40 @@ const SessionSeedModalInner = (props: ModalInnerProps) => {
   const [passwordHash, setPasswordHash] = useState('');
   const dispatch = useDispatch();
 
-  useEffect(() => {
+  useMount(() => {
+    async function checkHasPassword() {
+      if (!loadingPassword) {
+        return;
+      }
+
+      const hash = await Data.getPasswordHash();
+      setHasPassword(!!hash);
+      setPasswordHash(hash || '');
+      setLoadingPassword(false);
+    }
+    async function getRecoveryPhrase() {
+      if (recoveryPhrase) {
+        return false;
+      }
+      const newRecoveryPhrase = getCurrentRecoveryPhrase();
+      setRecoveryPhrase(newRecoveryPhrase);
+      setLoadingSeed(false);
+
+      return true;
+    }
+
     setTimeout(() => (document.getElementById('seed-input-password') as any)?.focus(), 100);
     void checkHasPassword();
     void getRecoveryPhrase();
-  }, []);
-
-  const i18n = window.i18n;
+  });
 
   const onClose = () => dispatch(recoveryPhraseModal(null));
 
-  const checkHasPassword = async () => {
-    if (!loadingPassword) {
-      return;
-    }
-
-    const hash = await Data.getPasswordHash();
-    setHasPassword(!!hash);
-    setPasswordHash(hash || '');
-    setLoadingPassword(false);
-  };
-
-  const getRecoveryPhrase = async () => {
-    if (recoveryPhrase) {
-      return false;
-    }
-    const newRecoveryPhrase = getCurrentRecoveryPhrase();
-    setRecoveryPhrase(newRecoveryPhrase);
-    setLoadingSeed(false);
-
-    return true;
-  };
-
   return (
     <>
       {!loadingSeed && (
         <SessionWrapperModal
-          title={i18n('showRecoveryPhrase')}
+          title={window.i18n('showRecoveryPhrase')}
           onClose={onClose}
           showExitIcon={true}
         >
diff --git a/ts/components/dialog/UpdateGroupMembersDialog.tsx b/ts/components/dialog/UpdateGroupMembersDialog.tsx
index b6e59d3c89..070a1c2b05 100644
--- a/ts/components/dialog/UpdateGroupMembersDialog.tsx
+++ b/ts/components/dialog/UpdateGroupMembersDialog.tsx
@@ -1,21 +1,22 @@
 import React from 'react';
+import _ from 'lodash';
+import { useDispatch } from 'react-redux';
+import useKey from 'react-use/lib/useKey';
+import styled from 'styled-components';
 
 import { ToastUtils, UserUtils } from '../../session/utils';
 
-import _ from 'lodash';
 import { SpacerLG, Text } from '../basic/Text';
 import { updateGroupMembersModal } from '../../state/ducks/modalDialog';
 import { SessionButton, SessionButtonColor, SessionButtonType } from '../basic/SessionButton';
 import { MemberListItem } from '../MemberListItem';
 import { SessionWrapperModal } from '../SessionWrapperModal';
-import { useDispatch } from 'react-redux';
+
 import { useConversationPropsById, useWeAreAdmin } from '../../hooks/useParamSelector';
-// tslint:disable-next-line: no-submodule-imports
-import useKey from 'react-use/lib/useKey';
+
 import { useSet } from '../../hooks/useSet';
 import { getConversationController } from '../../session/conversations';
 import { initiateClosedGroupUpdate } from '../../session/group/closed-group';
-import styled from 'styled-components';
 
 type Props = {
   conversationId: string;
@@ -110,7 +111,6 @@ const ZombiesList = ({ convoId }: { convoId: string }) => {
   );
 };
 
-// tslint:disable-next-line: max-func-body-length
 async function onSubmit(convoId: string, membersAfterUpdate: Array<string>) {
   const convoFound = getConversationController().get(convoId);
   if (!convoFound || !convoFound.isGroup()) {
diff --git a/ts/components/dialog/UpdateGroupNameDialog.tsx b/ts/components/dialog/UpdateGroupNameDialog.tsx
index 86e3da014d..63b59276fc 100644
--- a/ts/components/dialog/UpdateGroupNameDialog.tsx
+++ b/ts/components/dialog/UpdateGroupNameDialog.tsx
@@ -1,10 +1,11 @@
+/* eslint-disable @typescript-eslint/no-misused-promises */
 import React from 'react';
 import classNames from 'classnames';
+import autoBind from 'auto-bind';
 
 import { Avatar, AvatarSize } from '../avatar/Avatar';
 import { SpacerMD } from '../basic/Text';
 import { updateGroupNameModal } from '../../state/ducks/modalDialog';
-import autoBind from 'auto-bind';
 import { ConversationModel } from '../../models/conversation';
 import { getConversationController } from '../../session/conversations';
 import { SessionWrapperModal } from '../SessionWrapperModal';
@@ -91,14 +92,11 @@ export class UpdateGroupNameDialog extends React.Component<Props, State> {
       this.state.errorDisplayed ? 'error-shown' : 'error-faded'
     );
 
-    const isAdmin = this.convo.isPublic()
-      ? false // disable editing of opengroup rooms as we don't handle them for now
-      : true;
+    const isAdmin = !this.convo.isPublic();
 
     return (
       <SessionWrapperModal
         title={titleText}
-        // tslint:disable-next-line: no-void-expression
         onClose={() => this.closeDialog()}
         additionalClassName="update-group-dialog"
       >
@@ -200,7 +198,6 @@ export class UpdateGroupNameDialog extends React.Component<Props, State> {
     if (!isPublic) {
       return undefined;
     }
-    // tslint:disable: use-simple-attributes
 
     return (
       <div className="avatar-center">
diff --git a/ts/components/dialog/UserDetailsDialog.tsx b/ts/components/dialog/UserDetailsDialog.tsx
index 5e311e011b..87be42e49a 100644
--- a/ts/components/dialog/UserDetailsDialog.tsx
+++ b/ts/components/dialog/UserDetailsDialog.tsx
@@ -1,5 +1,4 @@
 import React, { useState } from 'react';
-// tslint:disable no-submodule-imports
 
 import useCopyToClipboard from 'react-use/lib/useCopyToClipboard';
 
@@ -20,6 +19,7 @@ export const UserDetailsDialog = (props: UserDetailsModalState) => {
 
   const size = isEnlargedImageShown ? AvatarSize.HUGE : AvatarSize.XL;
 
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
   const [_, copyToClipboard] = useCopyToClipboard();
 
   function closeDialog() {
diff --git a/ts/components/icon/DropDownAndToggleButton.tsx b/ts/components/icon/DropDownAndToggleButton.tsx
index 587d4ed00c..fccb8a3db3 100644
--- a/ts/components/icon/DropDownAndToggleButton.tsx
+++ b/ts/components/icon/DropDownAndToggleButton.tsx
@@ -1,5 +1,4 @@
 import React from 'react';
-import _ from 'lodash';
 import styled from 'styled-components';
 import { contextMenu } from 'react-contexify';
 
diff --git a/ts/components/icon/Icons.tsx b/ts/components/icon/Icons.tsx
index 9f1f2c6b27..9be3ed3bd0 100644
--- a/ts/components/icon/Icons.tsx
+++ b/ts/components/icon/Icons.tsx
@@ -1,3 +1,5 @@
+/* eslint-disable max-len */
+/* eslint-disable no-multi-str */
 export type SessionIconType =
   | 'addUser'
   | 'arrow'
diff --git a/ts/components/icon/MemberAvatarPlaceHolder.tsx b/ts/components/icon/MemberAvatarPlaceHolder.tsx
index 3ef4832846..1616ff8145 100644
--- a/ts/components/icon/MemberAvatarPlaceHolder.tsx
+++ b/ts/components/icon/MemberAvatarPlaceHolder.tsx
@@ -1,5 +1,4 @@
 import React from 'react';
-// tslint:disable: no-http-string
 
 export const MemberAvatarPlaceHolder = () => {
   return (
diff --git a/ts/components/icon/SessionIcon.tsx b/ts/components/icon/SessionIcon.tsx
index dda4a5741e..e47c520bd8 100644
--- a/ts/components/icon/SessionIcon.tsx
+++ b/ts/components/icon/SessionIcon.tsx
@@ -1,7 +1,8 @@
 import React from 'react';
-import { icons, SessionIconSize, SessionIconType } from '../icon';
 import styled, { css, keyframes } from 'styled-components';
 
+import { icons, SessionIconSize, SessionIconType } from '.';
+
 export type SessionIconProps = {
   iconType: SessionIconType;
   iconSize: SessionIconSize | number;
@@ -19,25 +20,24 @@ export type SessionIconProps = {
 const getIconDimensionFromIconSize = (iconSize: SessionIconSize | number) => {
   if (typeof iconSize === 'number') {
     return iconSize;
-  } else {
-    switch (iconSize) {
-      case 'tiny':
-        return 12;
-      case 'small':
-        return 15;
-      case 'medium':
-        return 20;
-      case 'large':
-        return 25;
-      case 'huge':
-        return 30;
-      case 'huge2':
-        return 40;
-      case 'max':
-        return 80;
-      default:
-        return 20;
-    }
+  }
+  switch (iconSize) {
+    case 'tiny':
+      return 12;
+    case 'small':
+      return 15;
+    case 'medium':
+      return 20;
+    case 'large':
+      return 25;
+    case 'huge':
+      return 30;
+    case 'huge2':
+      return 40;
+    case 'max':
+      return 80;
+    default:
+      return 20;
   }
 };
 
@@ -68,7 +68,7 @@ const rotate = keyframes`
  * Creates a glow animation made for multiple element sequentially
  */
 const glow = (color: string, glowDuration: number, glowStartDelay: number) => {
-  //increase shadow intensity by 3
+  // increase shadow intensity by 3
   const dropShadow = `drop-shadow(0px 0px 6px ${color});`;
 
   // creating keyframe for sequential animations
@@ -117,11 +117,9 @@ const animation = (props: {
       )} ${props.glowDuration}s ease infinite;
     `;
   }
-
-  return;
+  return undefined;
 };
 
-//tslint:disable no-unnecessary-callback-wrapper
 const Svg = React.memo(styled.svg<StyledSvgProps>`
   width: ${props => props.width};
   transform: ${props => `rotate(${props.iconRotation}deg)`};
@@ -135,7 +133,6 @@ const Svg = React.memo(styled.svg<StyledSvgProps>`
   padding: ${props => (props.iconPadding ? props.iconPadding : '')};
   transition: inherit;
 `);
-// tslint:enable no-unnecessary-callback-wrapper
 
 const SessionSvg = (props: {
   viewBox: string;
diff --git a/ts/components/icon/SessionIconButton.tsx b/ts/components/icon/SessionIconButton.tsx
index c446c826e9..e53db3d8bf 100644
--- a/ts/components/icon/SessionIconButton.tsx
+++ b/ts/components/icon/SessionIconButton.tsx
@@ -1,10 +1,11 @@
 import React from 'react';
 import classNames from 'classnames';
-import { SessionIcon, SessionIconProps } from '../icon';
 import _ from 'lodash';
-import { SessionNotificationCount } from './SessionNotificationCount';
 import styled from 'styled-components';
 
+import { SessionIcon, SessionIconProps } from '.';
+import { SessionNotificationCount } from './SessionNotificationCount';
+
 interface SProps extends SessionIconProps {
   onClick?: (e: React.MouseEvent<HTMLDivElement>) => void;
   notificationCount?: number;
@@ -36,6 +37,7 @@ const StyledSessionIconButton = styled.div<{ color?: string; isSelected?: boolea
   }
 `;
 
+// eslint-disable-next-line react/display-name
 const SessionIconButtonInner = React.forwardRef<HTMLDivElement, SProps>((props, ref) => {
   const {
     iconType,
@@ -72,7 +74,7 @@ const SessionIconButtonInner = React.forwardRef<HTMLDivElement, SProps>((props,
       ref={ref}
       id={id}
       onClick={clickHandler}
-      style={{ ...style, display: isHidden ? 'none' : 'flex', margin: margin ? margin : '' }}
+      style={{ ...style, display: isHidden ? 'none' : 'flex', margin: margin || '' }}
       data-testid={dataTestId}
     >
       <SessionIcon
diff --git a/ts/components/leftpane/ActionsPanel.tsx b/ts/components/leftpane/ActionsPanel.tsx
index 7d4fb90c8b..49853ca63c 100644
--- a/ts/components/leftpane/ActionsPanel.tsx
+++ b/ts/components/leftpane/ActionsPanel.tsx
@@ -1,14 +1,16 @@
+import { ipcRenderer } from 'electron';
 import React, { useEffect, useState } from 'react';
-import { getConversationController } from '../../session/conversations';
-import { syncConfigurationIfNeeded } from '../../session/utils/sync/syncUtils';
 
+import { debounce, isEmpty, isString } from 'lodash';
 import { useDispatch, useSelector } from 'react-redux';
-import { Data } from '../../data/data';
-import { getMessageQueue } from '../../session/sending';
-// tslint:disable: no-submodule-imports
 import useInterval from 'react-use/lib/useInterval';
 import useTimeoutFn from 'react-use/lib/useTimeoutFn';
 
+import { Data } from '../../data/data';
+import { getConversationController } from '../../session/conversations';
+import { getMessageQueue } from '../../session/sending';
+import { syncConfigurationIfNeeded } from '../../session/utils/sync/syncUtils';
+
 import { clearSearch } from '../../state/ducks/search';
 import { resetOverlayMode, SectionType, showLeftPaneSection } from '../../state/ducks/section';
 import {
@@ -22,13 +24,9 @@ import { cleanUpOldDecryptedMedias } from '../../session/crypto/DecryptedAttachm
 
 import { DURATION } from '../../session/constants';
 
-import { debounce, isEmpty, isString } from 'lodash';
 import { uploadOurAvatar } from '../../interactions/conversationInteractions';
 import { editProfileModal, onionPathModal } from '../../state/ducks/modalDialog';
 
-// tslint:disable-next-line: no-import-side-effect no-submodule-imports
-
-import { ipcRenderer } from 'electron';
 import { loadDefaultRooms } from '../../session/apis/open_group_api/opengroupV2/ApiUtil';
 import { getOpenGroupManager } from '../../session/apis/open_group_api/opengroupV2/OpenGroupManagerV2';
 import { getSwarmPollingInstance } from '../../session/apis/snode_api';
@@ -58,8 +56,7 @@ const Section = (props: { type: SectionType }) => {
   const focusedSection = useSelector(getFocusedSection);
   const isSelected = focusedSection === props.type;
 
-  const handleClick = async () => {
-    /* tslint:disable:no-void-expression */
+  const handleClick = () => {
     if (type === SectionType.Profile) {
       dispatch(editProfileModal({}));
     } else if (type === SectionType.ColorMode) {
@@ -69,7 +66,7 @@ const Section = (props: { type: SectionType }) => {
         : currentTheme.replace('light', 'dark')) as ThemeStateType;
 
       // We want to persist the primary color when using the color mode button
-      await switchThemeTo({
+      void switchThemeTo({
         theme: newTheme,
         mainWindow: true,
         usePrimaryColor: true,
@@ -259,34 +256,48 @@ export const ActionsPanel = () => {
   useInterval(cleanUpOldDecryptedMedias, startCleanUpMedia ? cleanUpMediasInterval : null);
 
   useInterval(() => {
+    if (!ourPrimaryConversation) {
+      return;
+    }
     void fetchReleaseFromFSAndUpdateMain();
   }, fetchReleaseFromFileServerInterval);
 
-  if (!ourPrimaryConversation) {
-    window?.log?.warn('ActionsPanel: ourPrimaryConversation is not set');
-    return null;
-  }
-
   useInterval(() => {
+    if (!ourPrimaryConversation) {
+      return;
+    }
     void syncConfigurationIfNeeded();
   }, DURATION.DAYS * 2);
 
   useInterval(() => {
+    if (!ourPrimaryConversation) {
+      return;
+    }
     // trigger an updates from the snodes every hour
 
     void forceRefreshRandomSnodePool();
   }, DURATION.HOURS * 1);
 
   useTimeoutFn(() => {
+    if (!ourPrimaryConversation) {
+      return;
+    }
     // trigger an updates from the snodes after 5 minutes, once
     void forceRefreshRandomSnodePool();
   }, DURATION.MINUTES * 5);
 
   useInterval(() => {
+    if (!ourPrimaryConversation) {
+      return;
+    }
     // this won't be run every days, but if the app stays open for more than 10 days
     void triggerAvatarReUploadIfNeeded();
   }, DURATION.DAYS * 1);
 
+  if (!ourPrimaryConversation) {
+    window?.log?.warn('ActionsPanel: ourPrimaryConversation is not set');
+    return null;
+  }
   return (
     <>
       <LeftPaneSectionContainer data-testid="leftpane-section-container">
diff --git a/ts/components/leftpane/ContactListItem.tsx b/ts/components/leftpane/ContactListItem.tsx
index 18720ea6ea..818bfc4ded 100644
--- a/ts/components/leftpane/ContactListItem.tsx
+++ b/ts/components/leftpane/ContactListItem.tsx
@@ -22,7 +22,7 @@ export const ContactListItem = (props: Props) => {
   const isMe = useIsMe(pubkey);
   const isGroup = !useIsPrivate(pubkey);
 
-  const title = name ? name : pubkey;
+  const title = name || pubkey;
   const displayName = isMe ? window.i18n('you') : title;
 
   return (
diff --git a/ts/components/leftpane/LeftPaneMessageSection.tsx b/ts/components/leftpane/LeftPaneMessageSection.tsx
index 1af354f24c..0e5075a2db 100644
--- a/ts/components/leftpane/LeftPaneMessageSection.tsx
+++ b/ts/components/leftpane/LeftPaneMessageSection.tsx
@@ -1,23 +1,23 @@
 import autoBind from 'auto-bind';
 import React from 'react';
+import { useSelector } from 'react-redux';
 import { AutoSizer, List, ListRowProps } from 'react-virtualized';
+import styled from 'styled-components';
 import { SearchResults } from '../search/SearchResults';
 import { LeftPaneSectionHeader } from './LeftPaneSectionHeader';
 import { MessageRequestsBanner } from './MessageRequestsBanner';
 
-import { useSelector } from 'react-redux';
-import styled from 'styled-components';
 import { OverlayMode, setOverlayMode } from '../../state/ducks/section';
 import { getOverlayMode } from '../../state/selectors/section';
+import { assertUnreachable } from '../../types/sqlSharedTypes';
 import { SessionSearchInput } from '../SessionSearchInput';
 import { StyledLeftPaneList } from './LeftPaneList';
+import { ConversationListItem } from './conversation-list-item/ConversationListItem';
 import { OverlayClosedGroup } from './overlay/OverlayClosedGroup';
 import { OverlayCommunity } from './overlay/OverlayCommunity';
 import { OverlayMessage } from './overlay/OverlayMessage';
 import { OverlayMessageRequest } from './overlay/OverlayMessageRequest';
 import { OverlayChooseAction } from './overlay/choose-action/OverlayChooseAction';
-import { ConversationListItem } from './conversation-list-item/ConversationListItem';
-import { assertUnreachable } from '../../types/sqlSharedTypes';
 
 export interface Props {
   conversationIds?: Array<string>;
@@ -74,7 +74,7 @@ export class LeftPaneMessageSection extends React.Component<Props> {
   public renderRow = ({ index, key, style }: ListRowProps): JSX.Element | null => {
     const { conversationIds } = this.props;
 
-    //assume conversations that have been marked unapproved should be filtered out by selector.
+    // assume conversations that have been marked unapproved should be filtered out by selector.
     if (!conversationIds) {
       throw new Error('renderRow: Tried to render without conversations');
     }
diff --git a/ts/components/leftpane/LeftPaneSettingSection.tsx b/ts/components/leftpane/LeftPaneSettingSection.tsx
index db1549c4c8..e6152806b4 100644
--- a/ts/components/leftpane/LeftPaneSettingSection.tsx
+++ b/ts/components/leftpane/LeftPaneSettingSection.tsx
@@ -1,8 +1,9 @@
 import React from 'react';
+import { useDispatch, useSelector } from 'react-redux';
 import styled from 'styled-components';
 
-import { LeftPaneSectionHeader } from './LeftPaneSectionHeader';
-import { useDispatch, useSelector } from 'react-redux';
+import { resetConversationExternal } from '../../state/ducks/conversations';
+import { recoveryPhraseModal, updateDeleteAccountModal } from '../../state/ducks/modalDialog';
 import {
   SectionType,
   setOverlayMode,
@@ -10,10 +11,9 @@ import {
   showSettingsSection,
 } from '../../state/ducks/section';
 import { getFocusedSettingsSection } from '../../state/selectors/section';
-import { recoveryPhraseModal, updateDeleteAccountModal } from '../../state/ducks/modalDialog';
 import { SessionIcon } from '../icon';
 import { SessionSettingCategory } from '../settings/SessionSettings';
-import { resetConversationExternal } from '../../state/ducks/conversations';
+import { LeftPaneSectionHeader } from './LeftPaneSectionHeader';
 
 const StyledSettingsSectionTitle = styled.strong`
   font-family: var(--font-font-accent);
diff --git a/ts/components/leftpane/conversation-list-item/ConversationListItem.tsx b/ts/components/leftpane/conversation-list-item/ConversationListItem.tsx
index cc67146a9a..f032d36ca4 100644
--- a/ts/components/leftpane/conversation-list-item/ConversationListItem.tsx
+++ b/ts/components/leftpane/conversation-list-item/ConversationListItem.tsx
@@ -1,15 +1,15 @@
 import classNames from 'classnames';
+import { isNil } from 'lodash';
 import React, { useCallback } from 'react';
 import { contextMenu } from 'react-contexify';
+import { createPortal } from 'react-dom';
+import { useDispatch, useSelector } from 'react-redux';
 
 import { Avatar, AvatarSize } from '../../avatar/Avatar';
 
-import { createPortal } from 'react-dom';
-import { useDispatch, useSelector } from 'react-redux';
 import { openConversationWithMessages } from '../../../state/ducks/conversations';
 import { updateUserDetailsModal } from '../../../state/ducks/modalDialog';
 
-import _, { isNil } from 'lodash';
 import {
   useAvatarPath,
   useConversationUsername,
@@ -26,9 +26,8 @@ import { ConversationListItemHeaderItem } from './HeaderItem';
 import { MessageItem } from './MessageItem';
 
 type PropsHousekeeping = {
-  style?: Object;
+  style?: object;
 };
-// tslint:disable: use-simple-attributes
 
 type Props = { conversationId: string } & PropsHousekeeping;
 
@@ -46,7 +45,7 @@ const AvatarItem = () => {
   function onPrivateAvatarClick() {
     dispatch(
       updateUserDetailsModal({
-        conversationId: conversationId,
+        conversationId,
         userName: userName || '',
         authorAvatarPath: avatarPath,
       })
@@ -86,10 +85,10 @@ const ConversationListItemInner = (props: Props) => {
   const triggerId = `${key}-ctxmenu`;
 
   const openConvo = useCallback(
-    async (e: React.MouseEvent<HTMLDivElement>) => {
+    (e: React.MouseEvent<HTMLDivElement>) => {
       // mousedown is invoked sooner than onClick, but for both right and left click
       if (e.button === 0) {
-        await openConversationWithMessages({ conversationKey: conversationId, messageId: null });
+        void openConversationWithMessages({ conversationKey: conversationId, messageId: null });
       }
     },
     [conversationId]
diff --git a/ts/components/leftpane/conversation-list-item/HeaderItem.tsx b/ts/components/leftpane/conversation-list-item/HeaderItem.tsx
index 45e4d64fe0..6061382f7b 100644
--- a/ts/components/leftpane/conversation-list-item/HeaderItem.tsx
+++ b/ts/components/leftpane/conversation-list-item/HeaderItem.tsx
@@ -148,7 +148,7 @@ const AtSymbol = ({ convoId }: { convoId: string }) => {
   return hasMentionedUs && hasUnread ? (
     <MentionAtSymbol
       title="Open to latest mention"
-      onMouseDown={e => openConvoToLastMention(e, convoId)}
+      onMouseDown={e => void openConvoToLastMention(e, convoId)}
     >
       @
     </MentionAtSymbol>
diff --git a/ts/components/leftpane/overlay/OverlayClosedGroup.tsx b/ts/components/leftpane/overlay/OverlayClosedGroup.tsx
index c283de7344..c115ad974e 100644
--- a/ts/components/leftpane/overlay/OverlayClosedGroup.tsx
+++ b/ts/components/leftpane/overlay/OverlayClosedGroup.tsx
@@ -1,19 +1,18 @@
 import React, { useState } from 'react';
 
 import { useDispatch, useSelector } from 'react-redux';
+import useKey from 'react-use/lib/useKey';
+import styled from 'styled-components';
 
 import { SessionButton } from '../../basic/SessionButton';
 import { SessionIdEditable } from '../../basic/SessionIdEditable';
 import { SessionSpinner } from '../../basic/SessionSpinner';
 import { MemberListItem } from '../../MemberListItem';
 import { OverlayHeader } from './OverlayHeader';
-// tslint:disable: no-submodule-imports use-simple-attributes
 
 import { resetOverlayMode } from '../../../state/ducks/section';
 import { getPrivateContactsPubkeys } from '../../../state/selectors/conversations';
 import { SpacerLG } from '../../basic/Text';
-import useKey from 'react-use/lib/useKey';
-import styled from 'styled-components';
 import { SessionSearchInput } from '../../SessionSearchInput';
 import { getSearchResultsContactOnly, isSearching } from '../../../state/selectors/search';
 import { useSet } from '../../../hooks/useSet';
@@ -65,7 +64,8 @@ async function createClosedGroupWithToasts(
     ToastUtils.pushToastError('invalidGroupName', window.i18n('invalidGroupNameTooShort'));
 
     return false;
-  } else if (groupName.length > VALIDATION.MAX_GROUP_NAME_LENGTH) {
+  }
+  if (groupName.length > VALIDATION.MAX_GROUP_NAME_LENGTH) {
     ToastUtils.pushToastError('invalidGroupName', window.i18n('invalidGroupNameTooLong'));
     return false;
   }
@@ -76,7 +76,8 @@ async function createClosedGroupWithToasts(
   if (groupMemberIds.length < 1) {
     ToastUtils.pushToastError('pickClosedGroupMember', window.i18n('pickClosedGroupMember'));
     return false;
-  } else if (groupMemberIds.length >= VALIDATION.CLOSED_GROUP_SIZE_LIMIT) {
+  }
+  if (groupMemberIds.length >= VALIDATION.CLOSED_GROUP_SIZE_LIMIT) {
     ToastUtils.pushToastError('closedGroupMaxSize', window.i18n('closedGroupMaxSize'));
     return false;
   }
diff --git a/ts/components/leftpane/overlay/OverlayCommunity.tsx b/ts/components/leftpane/overlay/OverlayCommunity.tsx
index c7bfe4851c..0939415068 100644
--- a/ts/components/leftpane/overlay/OverlayCommunity.tsx
+++ b/ts/components/leftpane/overlay/OverlayCommunity.tsx
@@ -1,5 +1,6 @@
 import React, { useState } from 'react';
-// tslint:disable: no-submodule-imports use-simple-attributes
+import useKey from 'react-use/lib/useKey';
+import { useDispatch, useSelector } from 'react-redux';
 
 import { SessionJoinableRooms } from './SessionJoinableDefaultRooms';
 
@@ -7,7 +8,6 @@ import { SessionButton } from '../../basic/SessionButton';
 import { SessionIdEditable } from '../../basic/SessionIdEditable';
 import { SessionSpinner } from '../../basic/SessionSpinner';
 import { OverlayHeader } from './OverlayHeader';
-import { useDispatch, useSelector } from 'react-redux';
 import { resetOverlayMode } from '../../../state/ducks/section';
 import {
   joinOpenGroupV2WithUIEvents,
@@ -15,7 +15,7 @@ import {
 } from '../../../session/apis/open_group_api/opengroupV2/JoinOpenGroupV2';
 import { openGroupV2CompleteURLRegex } from '../../../session/apis/open_group_api/utils/OpenGroupUtils';
 import { ToastUtils } from '../../../session/utils';
-import useKey from 'react-use/lib/useKey';
+
 import { getOverlayMode } from '../../../state/selectors/section';
 import {
   markConversationInitialLoadingInProgress,
@@ -30,11 +30,10 @@ async function joinOpenGroup(
   if (serverUrl.match(openGroupV2CompleteURLRegex)) {
     const groupCreated = await joinOpenGroupV2WithUIEvents(serverUrl, true, false, uiCallback);
     return groupCreated;
-  } else {
-    ToastUtils.pushToastError('invalidOpenGroupUrl', window.i18n('invalidOpenGroupUrl'));
-    window.log.warn('Invalid opengroupv2 url');
-    return false;
   }
+  ToastUtils.pushToastError('invalidOpenGroupUrl', window.i18n('invalidOpenGroupUrl'));
+  window.log.warn('Invalid opengroupv2 url');
+  return false;
 }
 
 export const OverlayCommunity = () => {
@@ -103,7 +102,7 @@ export const OverlayCommunity = () => {
       <SessionButton text={buttonText} disabled={!groupUrl} onClick={onTryJoinRoom} />
 
       <SessionSpinner loading={loading} />
-      <SessionJoinableRooms onJoinClick={onTryJoinRoom} alreadyJoining={loading} />
+      <SessionJoinableRooms onJoinClick={() => void onTryJoinRoom()} alreadyJoining={loading} />
     </div>
   );
 };
diff --git a/ts/components/leftpane/overlay/OverlayMessage.tsx b/ts/components/leftpane/overlay/OverlayMessage.tsx
index 5fefc0f293..9140169688 100644
--- a/ts/components/leftpane/overlay/OverlayMessage.tsx
+++ b/ts/components/leftpane/overlay/OverlayMessage.tsx
@@ -1,24 +1,24 @@
 import React, { useState } from 'react';
-// tslint:disable: use-simple-attributes no-submodule-imports
+import useKey from 'react-use/lib/useKey';
+import styled from 'styled-components';
 
 import { useDispatch } from 'react-redux';
-import { SessionButton } from '../../basic/SessionButton';
-import { SessionIdEditable } from '../../basic/SessionIdEditable';
-import { SessionSpinner } from '../../basic/SessionSpinner';
-import { OverlayHeader } from './OverlayHeader';
-import { resetOverlayMode } from '../../../state/ducks/section';
-import { PubKey } from '../../../session/types';
 import { ConversationTypeEnum } from '../../../models/conversationAttributes';
 import { getConversationController } from '../../../session/conversations';
+import { PubKey } from '../../../session/types';
 import { ToastUtils, UserUtils } from '../../../session/utils';
 import { openConversationWithMessages } from '../../../state/ducks/conversations';
-import useKey from 'react-use/lib/useKey';
-import { YourSessionIDPill, YourSessionIDSelectable } from '../../basic/YourSessionIDPill';
+import { resetOverlayMode } from '../../../state/ducks/section';
+import { SessionButton } from '../../basic/SessionButton';
+import { SessionIdEditable } from '../../basic/SessionIdEditable';
+import { SessionSpinner } from '../../basic/SessionSpinner';
+import { OverlayHeader } from './OverlayHeader';
+
+import { ONSResolve } from '../../../session/apis/snode_api/onsResolve';
 import { Flex } from '../../basic/Flex';
-import { SessionIconButton } from '../../icon';
 import { SpacerMD } from '../../basic/Text';
-import styled from 'styled-components';
-import { ONSResolve } from '../../../session/apis/snode_api/onsResolve';
+import { YourSessionIDPill, YourSessionIDSelectable } from '../../basic/YourSessionIDPill';
+import { SessionIconButton } from '../../icon';
 
 const SessionIDDescription = styled.div`
   color: var(--text-secondary-color);
diff --git a/ts/components/leftpane/overlay/OverlayMessageRequest.tsx b/ts/components/leftpane/overlay/OverlayMessageRequest.tsx
index d016e448cc..529ffd6197 100644
--- a/ts/components/leftpane/overlay/OverlayMessageRequest.tsx
+++ b/ts/components/leftpane/overlay/OverlayMessageRequest.tsx
@@ -1,5 +1,4 @@
 import React from 'react';
-// tslint:disable: no-submodule-imports use-simple-attributes
 
 import { useDispatch, useSelector } from 'react-redux';
 import useKey from 'react-use/lib/useKey';
@@ -77,6 +76,7 @@ export const OverlayMessageRequest = () => {
 
           for (let index = 0; index < messageRequests.length; index++) {
             const convoId = messageRequests[index];
+            // eslint-disable-next-line no-await-in-loop
             await declineConversationWithoutConfirm({
               blockContact: false,
               conversationId: convoId,
diff --git a/ts/components/leftpane/overlay/SessionJoinableDefaultRooms.tsx b/ts/components/leftpane/overlay/SessionJoinableDefaultRooms.tsx
index cae773e81d..3325213867 100644
--- a/ts/components/leftpane/overlay/SessionJoinableDefaultRooms.tsx
+++ b/ts/components/leftpane/overlay/SessionJoinableDefaultRooms.tsx
@@ -11,7 +11,6 @@ import { Flex } from '../../basic/Flex';
 import { PillContainerHoverable, StyledPillContainerHoverable } from '../../basic/PillContainer';
 import { SessionSpinner } from '../../basic/SessionSpinner';
 import { H3 } from '../../basic/Text';
-// tslint:disable: no-void-expression
 
 export type JoinableRoomProps = {
   completeUrl: string;
@@ -37,6 +36,7 @@ const SessionJoinableRoomAvatar = (props: JoinableRoomProps) => {
         if (isCancelled) {
           return;
         }
+        // eslint-disable-next-line more/no-then
         sogsV3FetchPreviewBase64({ ...parsedInfos, imageID })
           .then(base64 => {
             if (isCancelled) {
@@ -63,10 +63,11 @@ const SessionJoinableRoomAvatar = (props: JoinableRoomProps) => {
     } catch (e) {
       window?.log?.warn(e.message);
     }
+    // eslint-disable-next-line consistent-return
     return () => {
       isCancelled = true;
     };
-  }, [props.imageId, props.completeUrl]);
+  }, [props.imageId, props.completeUrl, dispatch, props.base64Data, props.roomId]);
 
   return (
     <Avatar
diff --git a/ts/components/leftpane/overlay/choose-action/ContactRow.tsx b/ts/components/leftpane/overlay/choose-action/ContactRow.tsx
index 4fe86fffe1..826d413520 100644
--- a/ts/components/leftpane/overlay/choose-action/ContactRow.tsx
+++ b/ts/components/leftpane/overlay/choose-action/ContactRow.tsx
@@ -86,7 +86,7 @@ export const ContactRow = (props: Props) => {
   return (
     <StyledRowContainer
       style={style}
-      onClick={() => openConversationWithMessages({ conversationKey: id, messageId: null })}
+      onClick={() => void openConversationWithMessages({ conversationKey: id, messageId: null })}
     >
       <AvatarItem id={id} displayName={displayName} />
       <StyledContactRowName data-testid="module-conversation__user__profile-name">
diff --git a/ts/components/leftpane/overlay/choose-action/OverlayChooseAction.tsx b/ts/components/leftpane/overlay/choose-action/OverlayChooseAction.tsx
index 2cc1781ff8..81a0ed6f94 100644
--- a/ts/components/leftpane/overlay/choose-action/OverlayChooseAction.tsx
+++ b/ts/components/leftpane/overlay/choose-action/OverlayChooseAction.tsx
@@ -1,13 +1,13 @@
-import React, { useEffect } from 'react';
-// tslint:disable: use-simple-attributes no-submodule-imports
+import React, { useCallback, useEffect } from 'react';
 
+import { isEmpty, isString } from 'lodash';
 import { useDispatch } from 'react-redux';
-import { resetOverlayMode, setOverlayMode } from '../../../../state/ducks/section';
 import useKey from 'react-use/lib/useKey';
 import styled from 'styled-components';
+import { resetOverlayMode, setOverlayMode } from '../../../../state/ducks/section';
+
 import { SessionIcon, SessionIconType } from '../../../icon';
 import { ContactsListWithBreaks } from './ContactsListWithBreaks';
-import { isEmpty, isString } from 'lodash';
 
 const StyledActionRow = styled.button`
   border: none;
@@ -50,41 +50,40 @@ export const OverlayChooseAction = () => {
     dispatch(resetOverlayMode());
   }
 
-  function openNewMessage() {
+  const openNewMessage = useCallback(() => {
     dispatch(setOverlayMode('message'));
-  }
+  }, [dispatch]);
 
-  function openCreateGroup() {
+  const openCreateGroup = useCallback(() => {
     dispatch(setOverlayMode('closed-group'));
-  }
+  }, [dispatch]);
 
-  function openJoinCommunity() {
+  const openJoinCommunity = useCallback(() => {
     dispatch(setOverlayMode('open-group'));
-  }
+  }, [dispatch]);
 
   useKey('Escape', closeOverlay);
 
-  function handlePaste(event: ClipboardEvent) {
-    event.preventDefault();
+  useEffect(() => {
+    function handlePaste(event: ClipboardEvent) {
+      event.preventDefault();
 
-    const pasted = event.clipboardData?.getData('text');
+      const pasted = event.clipboardData?.getData('text');
 
-    if (pasted && isString(pasted) && !isEmpty(pasted)) {
-      if (pasted.startsWith('http') || pasted.startsWith('https')) {
-        openJoinCommunity();
-      } else if (pasted.startsWith('05')) {
-        openNewMessage();
+      if (pasted && isString(pasted) && !isEmpty(pasted)) {
+        if (pasted.startsWith('http') || pasted.startsWith('https')) {
+          openJoinCommunity();
+        } else if (pasted.startsWith('05')) {
+          openNewMessage();
+        }
       }
     }
-  }
-
-  useEffect(() => {
     document?.addEventListener('paste', handlePaste);
 
     return () => {
       document?.removeEventListener('paste', handlePaste);
     };
-  }, []);
+  }, [openJoinCommunity, openNewMessage]);
 
   return (
     <div className="module-left-pane-overlay">
diff --git a/ts/components/lightbox/Lightbox.tsx b/ts/components/lightbox/Lightbox.tsx
index 22a1afa039..0de1b43c51 100644
--- a/ts/components/lightbox/Lightbox.tsx
+++ b/ts/components/lightbox/Lightbox.tsx
@@ -1,11 +1,9 @@
-// tslint:disable:react-a11y-anchors
-
 import React, { useRef } from 'react';
 
-// useCss has some issues on our setup. so import it directly
-// tslint:disable-next-line: no-submodule-imports
 import useUnmount from 'react-use/lib/useUnmount';
 import { useDispatch } from 'react-redux';
+import { isUndefined } from 'lodash';
+import styled from 'styled-components';
 import { useDisableDrag } from '../../hooks/useDisableDrag';
 import { useEncryptedFileFetch } from '../../hooks/useEncryptedFileFetch';
 import { showLightBox } from '../../state/ducks/conversations';
@@ -13,8 +11,6 @@ import { GoogleChrome } from '../../util';
 import { Flex } from '../basic/Flex';
 import { SessionIconButton, SessionIconType } from '../icon';
 import * as MIME from '../../types/MIME';
-import { isUndefined } from 'lodash';
-import styled from 'styled-components';
 import { assertUnreachable } from '../../types/sqlSharedTypes';
 
 const colorSVG = (url: string, color: string) => {
@@ -71,7 +67,7 @@ const styles = {
   } as React.CSSProperties,
   objectParentContainer: {
     flexGrow: 1,
-    textAlign: 'center' as 'center',
+    textAlign: 'center' as const,
     margin: 'auto',
   },
   object: {
@@ -204,7 +200,6 @@ const Icon = ({
   />
 );
 
-// tslint:disable-next-line: max-func-body-length
 export const LightboxObject = ({
   objectURL,
   contentType,
diff --git a/ts/components/lightbox/LightboxGallery.tsx b/ts/components/lightbox/LightboxGallery.tsx
index 6361cd819e..5ff18f6d51 100644
--- a/ts/components/lightbox/LightboxGallery.tsx
+++ b/ts/components/lightbox/LightboxGallery.tsx
@@ -1,13 +1,9 @@
-/**
- * @prettier
- */
 import React, { useCallback, useEffect, useState } from 'react';
+import { useDispatch } from 'react-redux';
+import useKey from 'react-use/lib/useKey';
 
 import { Lightbox } from './Lightbox';
 
-// tslint:disable-next-line: no-submodule-imports
-import { useDispatch } from 'react-redux';
-import useKey from 'react-use/lib/useKey';
 import { showLightBox } from '../../state/ducks/conversations';
 import { useSelectedConversationKey } from '../../state/selectors/selectedConversation';
 import { MIME } from '../../types';
@@ -35,15 +31,12 @@ export const LightboxGallery = (props: Props) => {
   const [currentIndex, setCurrentIndex] = useState(-1);
   const selectedConversation = useSelectedConversationKey();
 
-  if (!selectedConversation) {
-    return null;
-  }
-
   const dispatch = useDispatch();
 
   // just run once, when the component is mounted. It's to show the lightbox on the specified index at start.
   useEffect(() => {
     setCurrentIndex(props.selectedIndex);
+    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
 
   const selectedMedia = media[currentIndex];
@@ -62,9 +55,12 @@ export const LightboxGallery = (props: Props) => {
   }, [currentIndex, lastIndex]);
 
   const handleSave = useCallback(() => {
+    if (!selectedConversation) {
+      return;
+    }
     const mediaItem = media[currentIndex];
     void saveAttachmentToDisk({ ...mediaItem, conversationId: selectedConversation });
-  }, [currentIndex, media]);
+  }, [currentIndex, media, selectedConversation]);
 
   useKey(
     'ArrowRight',
@@ -91,6 +87,10 @@ export const LightboxGallery = (props: Props) => {
     undefined,
     [currentIndex]
   );
+  if (!selectedConversation) {
+    return null;
+  }
+
   // just to avoid to render the first element during the first render when the user selected another item
   if (currentIndex === -1) {
     return null;
@@ -100,7 +100,6 @@ export const LightboxGallery = (props: Props) => {
 
   const caption = attachment?.caption;
   return (
-    // tslint:disable: use-simple-attributes
     <Lightbox
       onPrevious={hasPrevious ? onPrevious : undefined}
       onNext={hasNext ? onNext : undefined}
diff --git a/ts/components/menu/ConversationHeaderMenu.tsx b/ts/components/menu/ConversationHeaderMenu.tsx
index db95f4bec7..841ec249ff 100644
--- a/ts/components/menu/ConversationHeaderMenu.tsx
+++ b/ts/components/menu/ConversationHeaderMenu.tsx
@@ -127,8 +127,8 @@ const DisappearingMessageMenuItem = (): JSX.Element | null => {
       {timerOptions.map(item => (
         <Item
           key={item.value}
-          onClick={async () => {
-            await setDisappearingMessagesByConvoId(selectedConvoId, item.value);
+          onClick={() => {
+            void setDisappearingMessagesByConvoId(selectedConvoId, item.value);
           }}
         >
           {item.name}
diff --git a/ts/components/menu/ConversationListItemContextMenu.tsx b/ts/components/menu/ConversationListItemContextMenu.tsx
index c5ac79725d..59f95b619b 100644
--- a/ts/components/menu/ConversationListItemContextMenu.tsx
+++ b/ts/components/menu/ConversationListItemContextMenu.tsx
@@ -1,4 +1,3 @@
-import _ from 'lodash';
 import React from 'react';
 import { animation, Item, Menu } from 'react-contexify';
 
@@ -89,8 +88,8 @@ export const PinConversationMenuItem = (): JSX.Element | null => {
   if (isMessagesSection && (!isPrivate || (isPrivate && isPrivateAndFriend))) {
     const conversation = getConversationController().get(conversationId);
 
-    const togglePinConversation = async () => {
-      await conversation?.togglePinned();
+    const togglePinConversation = () => {
+      void conversation?.togglePinned();
     };
 
     const menuText = isPinned ? window.i18n('unpinConversation') : window.i18n('pinConversation');
diff --git a/ts/components/menu/Menu.tsx b/ts/components/menu/Menu.tsx
index f00ae0b7a2..80430bbce8 100644
--- a/ts/components/menu/Menu.tsx
+++ b/ts/components/menu/Menu.tsx
@@ -83,8 +83,8 @@ export const MarkConversationUnreadMenuItem = (): JSX.Element | null => {
   if (isMessagesSection && (!isPrivate || (isPrivate && isPrivateAndFriend))) {
     const conversation = getConversationController().get(conversationId);
 
-    const markUnread = async () => {
-      await conversation?.markAsUnread(true);
+    const markUnread = () => {
+      void conversation?.markAsUnread(true);
     };
 
     return <Item onClick={markUnread}>{window.i18n('markUnread')}</Item>;
@@ -104,9 +104,7 @@ export const DeletePrivateContactMenuItem = () => {
   const isRequest = useIsIncomingRequest(convoId);
 
   if (isPrivate && !isRequest) {
-    let menuItemText: string;
-
-    menuItemText = window.i18n('editMenuDeleteContact');
+    const menuItemText = window.i18n('editMenuDeleteContact');
 
     const onClickClose = () => {
       dispatch(updateConfirmModal(null));
@@ -240,8 +238,8 @@ export const UpdateGroupNameMenuItem = () => {
   if (!isKickedFromGroup && !left && weAreAdmin) {
     return (
       <Item
-        onClick={async () => {
-          await showUpdateGroupNameByConvoId(convoId);
+        onClick={() => {
+          void showUpdateGroupNameByConvoId(convoId);
         }}
       >
         {window.i18n('editGroup')}
@@ -359,11 +357,10 @@ export const MarkAllReadMenuItem = (): JSX.Element | null => {
   const isIncomingRequest = useIsIncomingRequest(convoId);
   if (!isIncomingRequest && !PubKey.isBlinded(convoId)) {
     return (
-      <Item onClick={() => markAllReadByConvoId(convoId)}>{window.i18n('markAllAsRead')}</Item>
+      <Item onClick={() => void markAllReadByConvoId(convoId)}>{window.i18n('markAllAsRead')}</Item>
     );
-  } else {
-    return null;
   }
+  return null;
 };
 
 export function isRtlBody(): boolean {
@@ -382,8 +379,8 @@ export const BlockMenuItem = (): JSX.Element | null => {
   if (!isMe && isPrivate && !isIncomingRequest && !PubKey.isBlinded(convoId)) {
     const blockTitle = isBlocked ? window.i18n('unblock') : window.i18n('block');
     const blockHandler = isBlocked
-      ? () => unblockConvoById(convoId)
-      : () => blockConvoById(convoId);
+      ? () => void unblockConvoById(convoId)
+      : () => void blockConvoById(convoId);
     return <Item onClick={blockHandler}>{blockTitle}</Item>;
   }
   return null;
@@ -401,7 +398,7 @@ export const ClearNicknameMenuItem = (): JSX.Element | null => {
   }
 
   return (
-    <Item onClick={() => clearNickNameByConvoId(convoId)}>{window.i18n('clearNickname')}</Item>
+    <Item onClick={() => void clearNickNameByConvoId(convoId)}>{window.i18n('clearNickname')}</Item>
   );
 };
 
@@ -464,8 +461,8 @@ export const DeletePrivateConversationMenuItem = () => {
 
   return (
     <Item
-      onClick={async () => {
-        await getConversationController().delete1o1(convoId, {
+      onClick={() => {
+        void getConversationController().delete1o1(convoId, {
           fromSyncMessage: false,
           justHidePrivate: true,
         });
@@ -485,6 +482,7 @@ export const AcceptMsgRequestMenuItem = () => {
   if (isRequest && isPrivate) {
     return (
       <Item
+        // eslint-disable-next-line @typescript-eslint/no-misused-promises
         onClick={async () => {
           await convo.setDidApproveMe(true);
           await convo.addOutgoingApprovalMessage(Date.now());
@@ -600,8 +598,8 @@ export const NotificationForConvoMenuItem = (): JSX.Element | null => {
         return (
           <Item
             key={item.value}
-            onClick={async () => {
-              await setNotificationForConvoId(convoId, item.value);
+            onClick={() => {
+              void setNotificationForConvoId(convoId, item.value);
             }}
             disabled={disabled}
           >
diff --git a/ts/components/menu/MessageRequestBannerContextMenu.tsx b/ts/components/menu/MessageRequestBannerContextMenu.tsx
index d6e3f67e43..c29b228dcb 100644
--- a/ts/components/menu/MessageRequestBannerContextMenu.tsx
+++ b/ts/components/menu/MessageRequestBannerContextMenu.tsx
@@ -1,9 +1,9 @@
 import React from 'react';
 import { animation, Item, Menu } from 'react-contexify';
-import _ from 'lodash';
+import { useDispatch } from 'react-redux';
 
 import { SessionContextMenuContainer } from '../SessionContextMenuContainer';
-import { useDispatch } from 'react-redux';
+
 import { hideMessageRequestBanner } from '../../state/ducks/userConfig';
 
 export type PropsContextConversationItem = {
diff --git a/ts/components/registration/RegistrationStages.tsx b/ts/components/registration/RegistrationStages.tsx
index 5a06f87f83..fe3e196d62 100644
--- a/ts/components/registration/RegistrationStages.tsx
+++ b/ts/components/registration/RegistrationStages.tsx
@@ -4,7 +4,7 @@ import { SignInMode, SignInTab } from './SignInTab';
 import { Data } from '../../data/data';
 import { getSwarmPollingInstance } from '../../session/apis/snode_api';
 import { getConversationController } from '../../session/conversations';
-import { mn_decode } from '../../session/crypto/mnemonic';
+import { mnDecode } from '../../session/crypto/mnemonic';
 import { PromiseUtils, StringUtils, ToastUtils } from '../../session/utils';
 import { TaskTimedOutError } from '../../session/utils/Promise';
 import { trigger } from '../../shims/events';
@@ -18,8 +18,6 @@ import { fromHex } from '../../session/utils/String';
 import { setSignInByLinking, setSignWithRecoveryPhrase, Storage } from '../../util/storage';
 import { SettingsKey } from '../../data/settings-key';
 
-// tslint:disable: use-simple-attributes
-
 export async function resetRegistration() {
   await Data.removeAll();
   Storage.reset();
@@ -188,16 +186,11 @@ export const RegistrationStages = () => {
   const [signInMode, setSignInMode] = useState(SignInMode.Default);
   const [signUpMode, setSignUpMode] = useState(SignUpMode.Default);
 
-  useEffect(() => {
-    void generateMnemonicAndKeyPair();
-    void resetRegistration();
-  }, []);
-
   const generateMnemonicAndKeyPair = async () => {
     if (generatedRecoveryPhrase === '') {
       const mnemonic = await generateMnemonic();
 
-      let seedHex = mn_decode(mnemonic);
+      let seedHex = mnDecode(mnemonic);
       // handle shorter than 32 bytes seeds
       const privKeyHexLength = 32 * 2;
       if (seedHex.length !== privKeyHexLength) {
@@ -213,6 +206,12 @@ export const RegistrationStages = () => {
     }
   };
 
+  useEffect(() => {
+    void generateMnemonicAndKeyPair();
+    void resetRegistration();
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
+
   const memoizedValue = React.useMemo(() => {
     return {
       registrationPhase,
diff --git a/ts/components/registration/RegistrationUserDetails.tsx b/ts/components/registration/RegistrationUserDetails.tsx
index dd56fe3c32..ab17a76e02 100644
--- a/ts/components/registration/RegistrationUserDetails.tsx
+++ b/ts/components/registration/RegistrationUserDetails.tsx
@@ -10,7 +10,6 @@ const DisplayNameInput = (props: {
   handlePressEnter: () => any;
 }) => {
   return (
-    // tslint:disable-next-line: use-simple-attributes
     <SessionInput
       autoFocus={props.stealAutoFocus || false}
       label={window.i18n('displayName')}
@@ -32,7 +31,6 @@ const RecoveryPhraseInput = (props: {
   stealAutoFocus?: boolean;
 }) => {
   return (
-    // tslint:disable-next-line: use-simple-attributes
     <SessionInput
       label={window.i18n('recoveryPhrase')}
       type="password"
@@ -48,7 +46,6 @@ const RecoveryPhraseInput = (props: {
 };
 
 export interface Props {
-  // tslint:disable: react-unused-props-and-state
   showDisplayNameField: boolean;
   showSeedField: boolean;
   stealAutoFocus?: boolean;
@@ -75,7 +72,6 @@ export const RegistrationUserDetails = (props: Props) => {
       )}
       <div className="inputfields">
         {props.showDisplayNameField && (
-          // tslint:disable-next-line: use-simple-attributes
           <DisplayNameInput
             stealAutoFocus={!props.showSeedField && props.stealAutoFocus}
             displayName={props.displayName}
diff --git a/ts/components/registration/SignInTab.tsx b/ts/components/registration/SignInTab.tsx
index 4060648092..088d4bc36a 100644
--- a/ts/components/registration/SignInTab.tsx
+++ b/ts/components/registration/SignInTab.tsx
@@ -20,8 +20,6 @@ export enum SignInMode {
   UsingRecoveryPhrase,
   LinkDevice,
 }
-// tslint:disable: use-simple-attributes
-// tslint:disable: react-unused-props-and-state
 
 const LinkDeviceButton = (props: { onLinkDeviceButtonClicked: () => any }) => {
   return (
diff --git a/ts/components/registration/SignUpTab.tsx b/ts/components/registration/SignUpTab.tsx
index f5c09ee78b..9a5f27ab8f 100644
--- a/ts/components/registration/SignUpTab.tsx
+++ b/ts/components/registration/SignUpTab.tsx
@@ -79,7 +79,7 @@ export const SignUpTab = () => {
     if (signUpMode === SignUpMode.SessionIDShown) {
       window.Session.setNewSessionID(hexGeneratedPubKey);
     }
-  }, [signUpMode]);
+  }, [signUpMode, hexGeneratedPubKey]);
 
   if (signUpMode === SignUpMode.Default) {
     return (
@@ -111,7 +111,7 @@ export const SignUpTab = () => {
   const signUpWithDetails = async () => {
     await signUp({
       displayName,
-      generatedRecoveryPhrase: generatedRecoveryPhrase,
+      generatedRecoveryPhrase,
     });
   };
 
diff --git a/ts/components/search/MessageSearchResults.tsx b/ts/components/search/MessageSearchResults.tsx
index 79f0df58f2..13ac830988 100644
--- a/ts/components/search/MessageSearchResults.tsx
+++ b/ts/components/search/MessageSearchResults.tsx
@@ -1,4 +1,5 @@
 import React from 'react';
+import styled, { CSSProperties } from 'styled-components';
 
 import { getOurPubKeyStrFromCache } from '../../session/utils/User';
 import { openConversationToSpecificMessage } from '../../state/ducks/conversations';
@@ -6,7 +7,6 @@ import { ContactName } from '../conversation/ContactName';
 import { Avatar, AvatarSize } from '../avatar/Avatar';
 import { Timestamp } from '../conversation/Timestamp';
 import { MessageBodyHighlight } from '../basic/MessageBodyHighlight';
-import styled, { CSSProperties } from 'styled-components';
 import { MessageAttributes } from '../../models/messageType';
 import { useConversationUsername, useIsPrivate } from '../../hooks/useParamSelector';
 import { UserUtils } from '../../session/utils';
@@ -208,7 +208,6 @@ export const MessageSearchResult = (props: MessageSearchResultProps) => {
   if (!source && !destination) {
     return null;
   }
-  // tslint:disable: use-simple-attributes
 
   return (
     <StyledSearchResults
diff --git a/ts/components/search/SearchResults.tsx b/ts/components/search/SearchResults.tsx
index 2b39a07b11..b33d185f4a 100644
--- a/ts/components/search/SearchResults.tsx
+++ b/ts/components/search/SearchResults.tsx
@@ -1,16 +1,18 @@
 import React from 'react';
 import styled, { CSSProperties } from 'styled-components';
+import { useSelector } from 'react-redux';
+import { AutoSizer, List } from 'react-virtualized';
+import { isString } from 'lodash';
+
 import { ConversationListItem } from '../leftpane/conversation-list-item/ConversationListItem';
 import { MessageSearchResult } from './MessageSearchResults';
-import { AutoSizer, List } from 'react-virtualized';
-import { useSelector } from 'react-redux';
+
 import {
   SearchResultsMergedListItem,
   getHasSearchResults,
   getSearchResultsList,
   getSearchTerm,
 } from '../../state/selectors/search';
-import { isString } from 'lodash';
 
 const StyledSeparatorSection = styled.div`
   height: 36px;
diff --git a/ts/components/settings/BlockedList.tsx b/ts/components/settings/BlockedList.tsx
index 93179c37c4..10b622b53a 100644
--- a/ts/components/settings/BlockedList.tsx
+++ b/ts/components/settings/BlockedList.tsx
@@ -1,6 +1,5 @@
 import React, { useState } from 'react';
 
-// tslint:disable-next-line: no-submodule-imports
 import useUpdate from 'react-use/lib/useUpdate';
 import styled from 'styled-components';
 import { useSet } from '../../hooks/useSet';
@@ -11,7 +10,6 @@ import { SpacerLG } from '../basic/Text';
 import { SessionIconButton } from '../icon';
 import { MemberListItem } from '../MemberListItem';
 import { SettingsTitleAndDescription } from './SessionSettingListItem';
-// tslint:disable: use-simple-attributes
 
 const BlockedEntriesContainer = styled.div`
   flex-shrink: 1;
diff --git a/ts/components/settings/SessionNotificationGroupSettings.tsx b/ts/components/settings/SessionNotificationGroupSettings.tsx
index 5ea8cafb97..1fd73d430c 100644
--- a/ts/components/settings/SessionNotificationGroupSettings.tsx
+++ b/ts/components/settings/SessionNotificationGroupSettings.tsx
@@ -1,5 +1,6 @@
+/* eslint-disable @typescript-eslint/no-misused-promises */
 import React from 'react';
-// tslint:disable-next-line: no-submodule-imports
+
 import useUpdate from 'react-use/lib/useUpdate';
 import styled from 'styled-components';
 import { SettingsKey } from '../../data/settings-key';
@@ -9,7 +10,6 @@ import { SessionButton } from '../basic/SessionButton';
 import { SessionRadioGroup } from '../basic/SessionRadioGroup';
 import { SpacerLG } from '../basic/Text';
 import { SessionSettingsItemWrapper, SessionToggleWithDescription } from './SessionSettingListItem';
-// tslint:disable: use-simple-attributes
 
 enum NOTIFICATION {
   MESSAGE = 'message',
diff --git a/ts/components/settings/SessionSettingListItem.tsx b/ts/components/settings/SessionSettingListItem.tsx
index c6904126f3..c2b111b231 100644
--- a/ts/components/settings/SessionSettingListItem.tsx
+++ b/ts/components/settings/SessionSettingListItem.tsx
@@ -1,4 +1,6 @@
 import React from 'react';
+import styled from 'styled-components';
+
 import {
   SessionButton,
   SessionButtonColor,
@@ -7,7 +9,6 @@ import {
 } from '../basic/SessionButton';
 import { SessionToggle } from '../basic/SessionToggle';
 import { SessionConfirmDialogProps } from '../dialog/SessionConfirm';
-import styled from 'styled-components';
 import { SessionIconButton } from '../icon';
 
 type ButtonSettingsProps = {
diff --git a/ts/components/settings/SessionSettings.tsx b/ts/components/settings/SessionSettings.tsx
index 31b967581a..e7dc6d2a56 100644
--- a/ts/components/settings/SessionSettings.tsx
+++ b/ts/components/settings/SessionSettings.tsx
@@ -1,18 +1,20 @@
 import React from 'react';
+import { shell } from 'electron';
+import autoBind from 'auto-bind';
+import styled from 'styled-components';
 
 import { SettingsHeader } from './SessionSettingsHeader';
-import { shell } from 'electron';
+
 import { SessionIconButton } from '../icon';
-import autoBind from 'auto-bind';
+
 import { SessionNotificationGroupSettings } from './SessionNotificationGroupSettings';
-// tslint:disable-next-line: no-submodule-imports
+
 import { CategoryConversations } from './section/CategoryConversations';
 import { SettingsCategoryPrivacy } from './section/CategoryPrivacy';
 import { SettingsCategoryAppearance } from './section/CategoryAppearance';
 import { Data } from '../../data/data';
 import { SettingsCategoryPermissions } from './section/CategoryPermissions';
 import { SettingsCategoryHelp } from './section/CategoryHelp';
-import styled from 'styled-components';
 import { sessionPassword } from '../../state/ducks/modalDialog';
 import { PasswordAction } from '../dialog/SessionPasswordDialog';
 import { SectionType, showLeftPaneSection } from '../../state/ducks/section';
@@ -171,6 +173,7 @@ export class SessionSettingsView extends React.Component<SettingsViewProps, Stat
     this.settingsViewRef = React.createRef();
     autoBind(this);
 
+    // eslint-disable-next-line more/no-then
     void Data.getPasswordHash().then(hash => {
       this.setState({
         hasPassword: !!hash,
diff --git a/ts/components/settings/SettingsThemeSwitcher.tsx b/ts/components/settings/SettingsThemeSwitcher.tsx
index 697a8646bb..2b7d6fecd5 100644
--- a/ts/components/settings/SettingsThemeSwitcher.tsx
+++ b/ts/components/settings/SettingsThemeSwitcher.tsx
@@ -14,8 +14,6 @@ import {
 import { switchPrimaryColorTo } from '../../themes/switchPrimaryColor';
 import { getPrimaryColor } from '../../state/selectors/primaryColor';
 
-// tslint:disable: use-simple-attributes
-
 const StyledSwitcherContainer = styled.div`
   font-size: var(--font-size-md);
   padding: var(--margins-lg);
@@ -84,8 +82,8 @@ const Themes = () => {
       {themes.map(theme => (
         <ThemeContainer
           key={theme.id}
-          onClick={async () => {
-            await switchThemeTo({
+          onClick={() => {
+            void switchThemeTo({
               theme: theme.id,
               mainWindow: true,
               dispatch,
@@ -131,8 +129,8 @@ export const SettingsThemeSwitcher = () => {
               inputName="primary-colors"
               ariaLabel={item.ariaLabel}
               color={item.color}
-              onClick={async () => {
-                await switchPrimaryColorTo(item.id, dispatch);
+              onClick={() => {
+                void switchPrimaryColorTo(item.id, dispatch);
               }}
             />
           );
diff --git a/ts/components/settings/ZoomingSessionSlider.tsx b/ts/components/settings/ZoomingSessionSlider.tsx
index a63ebaf3ad..11695e71c9 100644
--- a/ts/components/settings/ZoomingSessionSlider.tsx
+++ b/ts/components/settings/ZoomingSessionSlider.tsx
@@ -1,6 +1,6 @@
 import Slider from 'rc-slider';
 import React from 'react';
-// tslint:disable-next-line: no-submodule-imports
+
 import useUpdate from 'react-use/lib/useUpdate';
 import { SessionSettingsItemWrapper } from './SessionSettingListItem';
 
@@ -23,6 +23,7 @@ export const ZoomingSessionSlider = (props: { onSliderChange?: (value: number) =
           min={60}
           max={200}
           defaultValue={currentValueFromSettings}
+          // eslint-disable-next-line @typescript-eslint/no-misused-promises
           onAfterChange={handleSlider}
         />
 
diff --git a/ts/components/settings/section/CategoryAppearance.tsx b/ts/components/settings/section/CategoryAppearance.tsx
index d665b607a6..8ad4400fc1 100644
--- a/ts/components/settings/section/CategoryAppearance.tsx
+++ b/ts/components/settings/section/CategoryAppearance.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-// tslint:disable-next-line: no-submodule-imports
+
 import useUpdate from 'react-use/lib/useUpdate';
 import { SettingsKey } from '../../../data/settings-key';
 import { isHideMenuBarSupported } from '../../../types/Settings';
diff --git a/ts/components/settings/section/CategoryConversations.tsx b/ts/components/settings/section/CategoryConversations.tsx
index 5308312265..3830883aed 100644
--- a/ts/components/settings/section/CategoryConversations.tsx
+++ b/ts/components/settings/section/CategoryConversations.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { useDispatch, useSelector } from 'react-redux';
-// tslint:disable-next-line: no-submodule-imports
+
 import useUpdate from 'react-use/lib/useUpdate';
 import { SettingsKey } from '../../../data/settings-key';
 import { ToastUtils } from '../../../session/utils';
@@ -8,7 +8,6 @@ import { toggleAudioAutoplay } from '../../../state/ducks/userConfig';
 import { getAudioAutoplay } from '../../../state/selectors/userConfig';
 
 import { BlockedContactsList } from '../BlockedList';
-// tslint:disable: use-simple-attributes
 
 import { SessionToggleWithDescription } from '../SessionSettingListItem';
 
@@ -32,6 +31,7 @@ const CommunitiesPruningSetting = () => {
   );
   return (
     <SessionToggleWithDescription
+      // eslint-disable-next-line @typescript-eslint/no-misused-promises
       onClickToggle={async () => {
         await toggleCommunitiesPruning();
         forceUpdate();
diff --git a/ts/components/settings/section/CategoryPermissions.tsx b/ts/components/settings/section/CategoryPermissions.tsx
index 1832d041c3..b749bfcb8c 100644
--- a/ts/components/settings/section/CategoryPermissions.tsx
+++ b/ts/components/settings/section/CategoryPermissions.tsx
@@ -1,5 +1,6 @@
+/* eslint-disable @typescript-eslint/no-misused-promises */
 import React from 'react';
-// tslint:disable-next-line: no-submodule-imports
+
 import useUpdate from 'react-use/lib/useUpdate';
 import { SettingsKey } from '../../../data/settings-key';
 import { CallManager, ToastUtils } from '../../../session/utils';
diff --git a/ts/components/settings/section/CategoryPrivacy.tsx b/ts/components/settings/section/CategoryPrivacy.tsx
index d2490dad98..b9768c10b1 100644
--- a/ts/components/settings/section/CategoryPrivacy.tsx
+++ b/ts/components/settings/section/CategoryPrivacy.tsx
@@ -1,5 +1,6 @@
+/* eslint-disable @typescript-eslint/no-misused-promises */
 import React from 'react';
-// tslint:disable-next-line: no-submodule-imports
+
 import useUpdate from 'react-use/lib/useUpdate';
 import { SettingsKey } from '../../../data/settings-key';
 import { ConversationTypeEnum } from '../../../models/conversationAttributes';
@@ -75,8 +76,8 @@ export const SettingsCategoryPrivacy = (props: {
           childrenDescription={<TypingBubbleItem />}
         />
         <SessionToggleWithDescription
-          onClickToggle={async () => {
-            await toggleLinkPreviews(isLinkPreviewsOn, forceUpdate);
+          onClickToggle={() => {
+            void toggleLinkPreviews(isLinkPreviewsOn, forceUpdate);
           }}
           title={window.i18n('linkPreviewsTitle')}
           description={window.i18n('linkPreviewDescription')}
diff --git a/ts/data/configDump/configDump.ts b/ts/data/configDump/configDump.ts
index 2ce49e4781..336cf401ab 100644
--- a/ts/data/configDump/configDump.ts
+++ b/ts/data/configDump/configDump.ts
@@ -1,4 +1,5 @@
 import { AsyncObjectWrapper, ConfigDumpDataNode, ConfigDumpRow } from '../../types/sqlSharedTypes';
+// eslint-disable-next-line import/no-unresolved, import/extensions
 import { ConfigWrapperObjectTypes } from '../../webworker/workers/browser/libsession_worker_functions';
 import { channels } from '../channels';
 import { cleanData } from '../dataUtils';
diff --git a/ts/data/data.ts b/ts/data/data.ts
index b199a2d1e9..df4c54d4f1 100644
--- a/ts/data/data.ts
+++ b/ts/data/data.ts
@@ -1,5 +1,4 @@
-// tslint:disable: no-require-imports no-var-requires one-variable-per-declaration no-void-expression
-// tslint:disable: function-name
+// eslint:disable: no-require-imports no-var-requires one-variable-per-declaration no-void-expression function-name
 
 import _ from 'lodash';
 import { MessageResultProps } from '../components/search/MessageSearchResults';
@@ -350,12 +349,10 @@ async function markAllAsReadByConversationNoExpiration(
   conversationId: string,
   returnMessagesUpdated: boolean // for performance reason we do not return them because usually they are not needed
 ): Promise<Array<number>> {
-  // tslint:disable-next-line: no-console
   const messagesIds = await channels.markAllAsReadByConversationNoExpiration(
     conversationId,
     returnMessagesUpdated
   );
-  // tslint:disable-next-line: no-console
   return messagesIds;
 }
 
@@ -390,6 +387,7 @@ async function getMessagesByConversation(
   });
 
   if (skipTimerInit) {
+    // eslint-disable-next-line no-restricted-syntax
     for (const message of messages) {
       message.skipTimerInit = skipTimerInit;
     }
@@ -419,6 +417,7 @@ async function getLastMessagesByConversation(
 ): Promise<MessageCollection> {
   const messages = await channels.getLastMessagesByConversation(conversationId, limit);
   if (skipTimerInit) {
+    // eslint-disable-next-line no-restricted-syntax
     for (const message of messages) {
       message.skipTimerInit = skipTimerInit;
     }
@@ -433,6 +432,7 @@ async function getLastMessageIdInConversation(conversationId: string) {
 
 async function getLastMessageInConversation(conversationId: string) {
   const messages = await channels.getLastMessagesByConversation(conversationId, 1);
+  // eslint-disable-next-line no-restricted-syntax
   for (const message of messages) {
     message.skipTimerInit = true;
   }
@@ -443,6 +443,7 @@ async function getLastMessageInConversation(conversationId: string) {
 
 async function getOldestMessageInConversation(conversationId: string) {
   const messages = await channels.getOldestMessageInConversation(conversationId);
+  // eslint-disable-next-line no-restricted-syntax
   for (const message of messages) {
     message.skipTimerInit = true;
   }
@@ -669,7 +670,7 @@ async function updateSnodePoolOnDb(snodesAsJsonString: string): Promise<void> {
 
 function keysToArrayBuffer(keys: any, data: any) {
   const updated = _.cloneDeep(data);
-  // tslint:disable: one-variable-per-declaration
+
   for (let i = 0, max = keys.length; i < max; i += 1) {
     const key = keys[i];
     const value = _.get(data, key);
@@ -696,7 +697,7 @@ function keysFromArrayBuffer(keys: any, data: any) {
   return updated;
 }
 
-const ITEM_KEYS: Object = {
+const ITEM_KEYS: object = {
   identityKey: ['value.pubKey', 'value.privKey'],
   profileKey: ['value'],
 };
diff --git a/ts/data/dataInit.ts b/ts/data/dataInit.ts
index c70944d7be..74c4797063 100644
--- a/ts/data/dataInit.ts
+++ b/ts/data/dataInit.ts
@@ -1,5 +1,4 @@
 import { ipcRenderer } from 'electron';
-import _ from 'lodash';
 import { channels } from './channels';
 import { ConfigDumpData } from './configDump/configDump';
 
@@ -125,7 +124,6 @@ export async function shutdown() {
     _shutdownCallback = (error: any) => {
       window?.log?.info('data.shutdown: process complete');
       if (error) {
-        // tslint:disable: no-void-expression
         return reject(error);
       }
 
@@ -154,7 +152,6 @@ function makeChannel(fnName: string) {
       });
 
       jobs[jobId].timer = setTimeout(
-        // tslint:disable: no-void-expression
         () => reject(new Error(`SQL channel job ${jobId} (${fnName}) timed out`)),
         DATABASE_UPDATE_TIMEOUT
       );
@@ -245,7 +242,6 @@ function removeJob(id: number) {
     jobs[id].timer = null;
   }
 
-  // tslint:disable-next-line: no-dynamic-delete
   delete jobs[id];
 
   if (_shutdownCallback) {
diff --git a/ts/data/dataUtils.ts b/ts/data/dataUtils.ts
index 08093d5177..7ea2af9712 100644
--- a/ts/data/dataUtils.ts
+++ b/ts/data/dataUtils.ts
@@ -1,3 +1,4 @@
+/* eslint-disable no-param-reassign */
 import _ from 'lodash';
 
 /**
@@ -8,7 +9,6 @@ import _ from 'lodash';
 export function cleanData(data: any): any {
   const keys = Object.keys(data);
 
-  // tslint:disable: one-variable-per-declaration
   for (let index = 0, max = keys.length; index < max; index += 1) {
     const key = keys[index];
     const value = data[key];
@@ -25,7 +25,7 @@ export function cleanData(data: any): any {
     } else if (_.isFunction(value)) {
       // just skip a function which has not a toNumber function. We don't want to save a function to the db.
       // an attachment comes with a toJson() function
-      // tslint:disable-next-line: no-dynamic-delete
+
       delete data[key];
     } else if (Array.isArray(value)) {
       data[key] = value.map(cleanData);
diff --git a/ts/data/opengroups.ts b/ts/data/opengroups.ts
index d14c7952a1..6b02ea559d 100644
--- a/ts/data/opengroups.ts
+++ b/ts/data/opengroups.ts
@@ -88,7 +88,7 @@ async function opengroupRoomsLoad() {
   const loadedFromDB = await OpenGroupData.getAllV2OpenGroupRooms();
 
   if (loadedFromDB) {
-    cachedRooms = new Array();
+    cachedRooms = [];
     loadedFromDB.forEach(r => {
       try {
         cachedRooms?.push(r as any);
@@ -159,7 +159,6 @@ async function saveV2OpenGroupRoom(room: OpenGroupV2Room): Promise<void> {
     if (isNumber(foundIndex) && foundIndex > -1) {
       throwIfNotLoaded()[foundIndex] = cloneDeep(room);
     }
-    return;
   }
 }
 
diff --git a/ts/hooks/useAppFocused.ts b/ts/hooks/useAppFocused.ts
index 0a1ef4e6a0..6523860b21 100644
--- a/ts/hooks/useAppFocused.ts
+++ b/ts/hooks/useAppFocused.ts
@@ -1,8 +1,8 @@
+import { ipcRenderer } from 'electron';
 import { useEffect } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
 import { setIsAppFocused } from '../state/ducks/section';
 import { getIsAppFocused } from '../state/selectors/section';
-import { ipcRenderer } from 'electron';
 
 /**
  * This custom hook should be called on the top of the app only once.
diff --git a/ts/hooks/useEncryptedFileFetch.ts b/ts/hooks/useEncryptedFileFetch.ts
index 038193a99e..8274e8d4d7 100644
--- a/ts/hooks/useEncryptedFileFetch.ts
+++ b/ts/hooks/useEncryptedFileFetch.ts
@@ -7,26 +7,24 @@ import {
 import { perfEnd, perfStart } from '../session/utils/Performance';
 
 export const useEncryptedFileFetch = (url: string, contentType: string, isAvatar: boolean) => {
-  // tslint:disable-next-line: no-bitwise
   const [urlToLoad, setUrlToLoad] = useState('');
   const [loading, setLoading] = useState(false);
 
   const mountedRef = useRef(true);
 
-  async function fetchUrl() {
-    perfStart(`getDecryptedMediaUrl-${url}`);
-
-    const decryptedUrl = await getDecryptedMediaUrl(url, contentType, isAvatar);
-    perfEnd(`getDecryptedMediaUrl-${url}`, `getDecryptedMediaUrl-${url}`);
-
-    if (mountedRef.current) {
-      setUrlToLoad(decryptedUrl);
-      setLoading(false);
-    }
-  }
   const alreadyDecrypted = getAlreadyDecryptedMediaUrl(url);
 
   useEffect(() => {
+    async function fetchUrl() {
+      perfStart(`getDecryptedMediaUrl-${url}`);
+      const decryptedUrl = await getDecryptedMediaUrl(url, contentType, isAvatar);
+      perfEnd(`getDecryptedMediaUrl-${url}`, `getDecryptedMediaUrl-${url}`);
+
+      if (mountedRef.current) {
+        setUrlToLoad(decryptedUrl);
+        setLoading(false);
+      }
+    }
     if (alreadyDecrypted) {
       return;
     }
@@ -34,10 +32,11 @@ export const useEncryptedFileFetch = (url: string, contentType: string, isAvatar
     mountedRef.current = true;
     void fetchUrl();
 
+    // eslint-disable-next-line consistent-return
     return () => {
       mountedRef.current = false;
     };
-  }, [url]);
+  }, [url, alreadyDecrypted, contentType, isAvatar]);
 
   if (alreadyDecrypted) {
     return { urlToLoad: alreadyDecrypted, loading: false };
diff --git a/ts/hooks/useFocusMount.ts b/ts/hooks/useFocusMount.ts
index d586667ad1..8bd2575017 100644
--- a/ts/hooks/useFocusMount.ts
+++ b/ts/hooks/useFocusMount.ts
@@ -1,5 +1,5 @@
 import React from 'react';
-// tslint:disable-next-line: no-submodule-imports
+
 import useMount from 'react-use/lib/useMount';
 
 export function useFocusMount(ref: React.RefObject<any>, isEditable?: boolean) {
diff --git a/ts/hooks/useModulo.ts b/ts/hooks/useModulo.ts
index 3c6c9cc274..f681c317e8 100644
--- a/ts/hooks/useModulo.ts
+++ b/ts/hooks/useModulo.ts
@@ -1,5 +1,5 @@
 import React from 'react';
-// tslint:disable-next-line: no-submodule-imports
+
 import useInterval from 'react-use/lib/useInterval';
 
 export function useModulo(loopBackAt: number, delay: number) {
diff --git a/ts/hooks/useParamSelector.ts b/ts/hooks/useParamSelector.ts
index ba26cf208d..a04e8b04d5 100644
--- a/ts/hooks/useParamSelector.ts
+++ b/ts/hooks/useParamSelector.ts
@@ -1,4 +1,4 @@
-import { compact, isEmpty, isNumber } from 'lodash';
+import { compact, isEmpty, isFinite, isNumber } from 'lodash';
 import { useSelector } from 'react-redux';
 import {
   hasValidIncomingRequestValues,
diff --git a/ts/hooks/useSet.ts b/ts/hooks/useSet.ts
index 2c361ee570..4f688cb44c 100644
--- a/ts/hooks/useSet.ts
+++ b/ts/hooks/useSet.ts
@@ -26,7 +26,6 @@ export function useSet<T>(initialValues: Array<T> = []) {
   const empty = useCallback(() => {
     if (uniqueValues.length) {
       setUniqueValues([]);
-      return;
     }
   }, [uniqueValues, setUniqueValues]);
 
diff --git a/ts/hooks/useVideoEventListener.ts b/ts/hooks/useVideoEventListener.ts
index b9231207c8..06c984aa30 100644
--- a/ts/hooks/useVideoEventListener.ts
+++ b/ts/hooks/useVideoEventListener.ts
@@ -1,6 +1,6 @@
 import { useEffect, useState } from 'react';
 import { useSelector } from 'react-redux';
-// tslint:disable-next-line: no-submodule-imports
+
 import useMountedState from 'react-use/lib/useMountedState';
 import {
   addVideoEventsListener,
@@ -25,7 +25,8 @@ export function useVideoCallEventsListener(uniqueId: string, onSame: boolean) {
     DEVICE_DISABLED_DEVICE_ID
   );
   const [remoteStreamVideoIsMuted, setRemoteStreamVideoIsMuted] = useState(true);
-  const mountedState = useMountedState();
+  const mountedStateFunc = useMountedState();
+  const mountedState = mountedStateFunc();
 
   const [currentConnectedCameras, setCurrentConnectedCameras] = useState<Array<InputItem>>([]);
   const [currentConnectedAudioInputs, setCurrentConnectedAudioInputs] = useState<Array<InputItem>>(
@@ -53,7 +54,7 @@ export function useVideoCallEventsListener(uniqueId: string, onSame: boolean) {
           isAudioMuted,
           currentSelectedAudioOutput: outputSelected,
         } = options;
-        if (mountedState()) {
+        if (mountedState) {
           setLocalStream(lLocalStream);
           setRemoteStream(lRemoteStream);
           setRemoteStreamVideoIsMuted(isRemoteVideoStreamMuted);
@@ -71,7 +72,7 @@ export function useVideoCallEventsListener(uniqueId: string, onSame: boolean) {
     return () => {
       removeVideoEventsListener(uniqueId);
     };
-  }, [ongoingCallPubkey, selectedConversationKey, isFullScreen]);
+  }, [ongoingCallPubkey, selectedConversationKey, isFullScreen, mountedState, onSame, uniqueId]);
 
   return {
     currentConnectedAudioInputs,
diff --git a/ts/interactions/conversationInteractions.ts b/ts/interactions/conversationInteractions.ts
index 6b6c7ca27c..8ded7592b1 100644
--- a/ts/interactions/conversationInteractions.ts
+++ b/ts/interactions/conversationInteractions.ts
@@ -391,7 +391,7 @@ export async function uploadOurAvatar(newAvatarDecrypted?: ArrayBuffer) {
   const ourConvo = getConversationController().get(UserUtils.getOurPubKeyStrFromCache());
   if (!ourConvo) {
     window.log.warn('ourConvo not found... This is not a valid case');
-    return;
+    return null;
   }
 
   let profileKey: Uint8Array | null;
@@ -410,20 +410,20 @@ export async function uploadOurAvatar(newAvatarDecrypted?: ArrayBuffer) {
     profileKey = ourConvoProfileKey ? fromHexToArray(ourConvoProfileKey) : null;
     if (!profileKey) {
       window.log.info('our profileKey not found. Not reuploading our avatar');
-      return;
+      return null;
     }
     const currentAttachmentPath = ourConvo.getAvatarPath();
 
     if (!currentAttachmentPath) {
       window.log.warn('No attachment currently set for our convo.. Nothing to do.');
-      return;
+      return null;
     }
 
     const decryptedAvatarUrl = await getDecryptedMediaUrl(currentAttachmentPath, IMAGE_JPEG, true);
 
     if (!decryptedAvatarUrl) {
       window.log.warn('Could not decrypt avatar stored locally..');
-      return;
+      return null;
     }
     const blob = await urlToBlob(decryptedAvatarUrl);
 
@@ -432,7 +432,7 @@ export async function uploadOurAvatar(newAvatarDecrypted?: ArrayBuffer) {
 
   if (!decryptedAvatarData?.byteLength) {
     window.log.warn('Could not read content of avatar ...');
-    return;
+    return null;
   }
 
   const encryptedData = await encryptProfile(decryptedAvatarData, profileKey);
@@ -440,7 +440,7 @@ export async function uploadOurAvatar(newAvatarDecrypted?: ArrayBuffer) {
   const avatarPointer = await uploadFileToFsWithOnionV4(encryptedData);
   if (!avatarPointer) {
     window.log.warn('failed to upload avatar to fileserver');
-    return;
+    return null;
   }
   const { fileUrl, fileId } = avatarPointer;
 
diff --git a/ts/interactions/conversations/unsendingInteractions.ts b/ts/interactions/conversations/unsendingInteractions.ts
index 91ebd423bd..85bdc930e6 100644
--- a/ts/interactions/conversations/unsendingInteractions.ts
+++ b/ts/interactions/conversations/unsendingInteractions.ts
@@ -54,7 +54,7 @@ async function unsendMessagesForEveryone(
     // sending to recipient all the messages separately for now
     await Promise.all(
       unsendMsgObjects.map(unsendObject => {
-        getMessageQueue()
+        return getMessageQueue()
           .sendToGroup({
             message: unsendObject,
             namespace: SnodeNamespaces.ClosedGroupMessage,
@@ -71,7 +71,7 @@ async function unsendMessagesForEveryone(
 }
 
 function getUnsendMessagesObjects(messages: Array<MessageModel>) {
-  //#region building request
+  // #region building request
   return compact(
     messages.map(message => {
       const author = message.get('source');
@@ -91,7 +91,7 @@ function getUnsendMessagesObjects(messages: Array<MessageModel>) {
       return new UnsendMessage(unsendParams);
     })
   );
-  //#endregion
+  // #endregion
 }
 
 /**
@@ -247,7 +247,7 @@ const doDeleteSelectedMessagesInSOGS = async (
   if (!ourDevicePubkey) {
     return;
   }
-  //#region open group v2 deletion
+  // #region open group v2 deletion
   // Get our Moderator status
   const isAdmin = conversation.isAdmin(ourDevicePubkey);
   const isModerator = conversation.isModerator(ourDevicePubkey);
@@ -273,12 +273,13 @@ const doDeleteSelectedMessagesInSOGS = async (
           deletionType: 'complete',
         });
       }
+      return null;
     })
   );
   // successful deletion
   ToastUtils.pushDeleted(toDeleteLocallyIds.length);
   window.inboxStore?.dispatch(resetSelectedMessageIds());
-  //#endregion
+  // #endregion
 };
 
 /**
@@ -303,10 +304,11 @@ const doDeleteSelectedMessages = async ({
 
   const isAllOurs = selectedMessages.every(message => ourDevicePubkey === message.getSource());
   if (conversation.isPublic()) {
-    return doDeleteSelectedMessagesInSOGS(selectedMessages, conversation, isAllOurs);
+    await doDeleteSelectedMessagesInSOGS(selectedMessages, conversation, isAllOurs);
+    return;
   }
 
-  //#region deletion for 1-1 and closed groups
+  // #region deletion for 1-1 and closed groups
 
   if (deleteForEveryone) {
     if (!isAllOurs) {
@@ -314,7 +316,8 @@ const doDeleteSelectedMessages = async ({
       window.inboxStore?.dispatch(resetSelectedMessageIds());
       return;
     }
-    return unsendMessagesForEveryone(conversation, selectedMessages);
+    await unsendMessagesForEveryone(conversation, selectedMessages);
+    return;
   }
 
   // delete just for me in a closed group only means delete locally
@@ -327,12 +330,11 @@ const doDeleteSelectedMessages = async ({
     return;
   }
   // otherwise, delete that message locally, from our swarm and from our other devices
-  return unsendMessageJustForThisUser(conversation, selectedMessages);
+  await unsendMessageJustForThisUser(conversation, selectedMessages);
 
-  //#endregion
+  // #endregion
 };
 
-// tslint:disable-next-line: max-func-body-length
 export async function deleteMessagesByIdForEveryone(
   messageIds: Array<string>,
   conversationId: string
@@ -358,7 +360,6 @@ export async function deleteMessagesByIdForEveryone(
 
         // explicitly close modal for this case.
         window.inboxStore?.dispatch(updateConfirmModal(null));
-        return;
       },
       closeAfterInput: false,
     })
@@ -435,10 +436,9 @@ async function deleteOpenGroupMessages(
   if (allMessagesAreDeleted) {
     window?.log?.info('Removed all those serverIds messages successfully');
     return validMessageModelsToRemove.map(m => m.id as string);
-  } else {
-    window?.log?.info(
-      'failed to remove all those serverIds message. not removing them locally neither'
-    );
-    return [];
   }
+  window?.log?.info(
+    'failed to remove all those serverIds message. not removing them locally neither'
+  );
+  return [];
 }
diff --git a/ts/interactions/messageInteractions.ts b/ts/interactions/messageInteractions.ts
index f5e4297e3a..2e4d15eea5 100644
--- a/ts/interactions/messageInteractions.ts
+++ b/ts/interactions/messageInteractions.ts
@@ -1,4 +1,3 @@
-import _ from 'lodash';
 import { joinOpenGroupV2WithUIEvents } from '../session/apis/open_group_api/opengroupV2/JoinOpenGroupV2';
 import {
   sogsV3AddAdmin,
diff --git a/ts/mains/about_start.tsx b/ts/mains/about_start.tsx
index ed31fcef04..fec0529f5d 100644
--- a/ts/mains/about_start.tsx
+++ b/ts/mains/about_start.tsx
@@ -1,4 +1,3 @@
-/* global $, Whisper */
 // const $body = $(document.body);
 
 import React from 'react';
diff --git a/ts/mains/main_node.ts b/ts/mains/main_node.ts
index f1245942f1..a445fb734d 100644
--- a/ts/mains/main_node.ts
+++ b/ts/mains/main_node.ts
@@ -1,3 +1,7 @@
+/* eslint-disable @typescript-eslint/no-misused-promises */
+/* eslint-disable no-void */
+/* eslint-disable import/first */
+/* eslint-disable import/order */
 /* eslint-disable no-console */
 
 import {
@@ -31,8 +35,6 @@ import packageJson from '../../package.json'; // checked - only node
 setupGlobalErrorHandler();
 import electronLocalshortcut from 'electron-localshortcut';
 
-// tslint:disable: no-console
-
 const getRealPath = pify(fs.realpath);
 
 // Hardcoding appId to prevent build failures on release.
@@ -195,7 +197,7 @@ function prepareURL(pathSegments: Array<string>, moreKeys?: { theme: any }) {
 function handleUrl(event: any, target: string) {
   event?.preventDefault();
   const { protocol } = url.parse(target);
-  // tslint:disable-next-line: no-http-string
+
   if (protocol === 'http:' || protocol === 'https:') {
     void shell.openExternal(target);
   }
@@ -237,7 +239,7 @@ function isVisible(window: { x: number; y: number; width: number }, bounds: any)
   const BOUNDS_BUFFER = 100;
 
   // requiring BOUNDS_BUFFER pixels on the left or right side
-  // tslint:disable: restrict-plus-operands
+
   const rightSideClearOfLeftBound = window.x + window.width >= boundsX + BOUNDS_BUFFER;
   const leftSideClearOfRightBound = window.x <= boundsX + boundsWidth - BOUNDS_BUFFER;
 
@@ -259,7 +261,7 @@ function getStartInTray() {
   const usingTrayIcon = startInTray || process.argv.some(arg => arg === '--use-tray-icon');
   return { usingTrayIcon, startInTray };
 }
-// tslint:disable-next-line: max-func-body-length
+
 async function createWindow() {
   const { minWidth, minHeight, width, height } = getWindowSize();
   windowConfig = windowConfig || {};
@@ -277,7 +279,7 @@ async function createWindow() {
       screen.getPrimaryDisplay().workAreaSize.width - getDefaultWindowSize().defaultWidth;
     const screenHeight =
       screen.getPrimaryDisplay().workAreaSize.height - getDefaultWindowSize().defaultHeight;
-    // tslint:disable: insecure-random
+
     picked.x = Math.floor(Math.random() * screenWidth);
     picked.y = Math.floor(Math.random() * screenHeight);
   }
@@ -593,7 +595,7 @@ async function showPasswordWindow() {
 }
 
 let aboutWindow: BrowserWindow | null;
-// tslint:disable-next-line: max-func-body-length
+
 async function showAbout() {
   if (aboutWindow) {
     aboutWindow.show();
@@ -711,7 +713,7 @@ async function saveDebugLog(_event: any, logText: any) {
     if (result === undefined || outputPath === undefined || outputPath === '') {
       throw Error("User clicked Save button but didn't create a file");
     }
-    // tslint:disable: non-literal-fs-path
+
     fs.writeFile(outputPath, logText, err => {
       if (err) {
         throw Error(`${err}`);
@@ -851,7 +853,6 @@ async function requestShutdown() {
       }
 
       resolve(undefined);
-      return;
     });
     mainWindow?.webContents.send('get-ready-for-shutdown');
 
diff --git a/ts/mains/main_renderer.tsx b/ts/mains/main_renderer.tsx
index f67e06b3b3..e66c8fb0ab 100644
--- a/ts/mains/main_renderer.tsx
+++ b/ts/mains/main_renderer.tsx
@@ -1,4 +1,10 @@
 import _ from 'lodash';
+import ReactDOM from 'react-dom';
+import Backbone from 'backbone';
+
+import React from 'react';
+import nativeEmojiData from '@emoji-mart/data';
+
 import { MessageModel } from '../models/message';
 import { isMacOS } from '../OS';
 import { queueAllCached } from '../receiver/receiver';
@@ -11,21 +17,16 @@ import { Notifications } from '../util/notifications';
 import { Registration } from '../util/registration';
 import { isSignInByLinking, Storage } from '../util/storage';
 import { Data } from '../data/data';
-import Backbone from 'backbone';
 import { SessionRegistrationView } from '../components/registration/SessionRegistrationView';
 import { SessionInboxView } from '../components/SessionInboxView';
 import { deleteAllLogs } from '../node/logs';
-import ReactDOM from 'react-dom';
-import React from 'react';
 import { OpenGroupData } from '../data/opengroups';
 import { loadKnownBlindedKeys } from '../session/apis/open_group_api/sogsv3/knownBlindedkeys';
-import nativeEmojiData from '@emoji-mart/data';
 import { initialiseEmojiData } from '../util/emoji';
 import { switchPrimaryColorTo } from '../themes/switchPrimaryColor';
 import { LibSessionUtil } from '../session/utils/libsession/libsession_utils';
 import { runners } from '../session/utils/job_runners/JobRunner';
 import { SettingsKey } from '../data/settings-key';
-// tslint:disable: max-classes-per-file
 
 // Globally disable drag and drop
 document.body.addEventListener(
@@ -48,7 +49,6 @@ document.body.addEventListener(
 // Load these images now to ensure that they don't flicker on first use
 const images = [];
 function preload(list: Array<string>) {
-  // tslint:disable-next-line: one-variable-per-declaration
   for (let index = 0, max = list.length; index < max; index += 1) {
     const image = new Image();
     image.src = `./images/${list[index]}`;
@@ -121,6 +121,7 @@ async function startJobRunners() {
 // We need this 'first' check because we don't want to start the app up any other time
 //   than the first time. And storage.fetch() will cause onready() to fire.
 let first = true;
+// eslint-disable-next-line @typescript-eslint/no-misused-promises
 Storage.onready(async () => {
   if (!first) {
     return;
@@ -219,10 +220,10 @@ Storage.onready(async () => {
 async function manageExpiringData() {
   await Data.cleanSeenMessages();
   await Data.cleanLastHashes();
+  // eslint-disable-next-line @typescript-eslint/no-misused-promises
   setTimeout(manageExpiringData, 1000 * 60 * 60);
 }
 
-// tslint:disable-next-line: max-func-body-length
 async function start() {
   void manageExpiringData();
   window.dispatchEvent(new Event('storage_ready'));
@@ -245,11 +246,12 @@ async function start() {
       const sentAt = message.get('sent_at');
 
       if (message.hasErrors()) {
-        return;
+        return null;
       }
 
       window.log.info(`Cleanup: Deleting unsent message ${sentAt}`);
       idsToCleanUp.push(message.id);
+      return null;
     })
   );
   if (idsToCleanUp.length) {
@@ -258,6 +260,7 @@ async function start() {
   window.log.info('Cleanup: complete');
 
   window.log.info('listening for registration events');
+  // eslint-disable-next-line @typescript-eslint/no-misused-promises
   WhisperEvents.on('registration_done', async () => {
     window.log.info('handling registration event');
 
@@ -274,7 +277,8 @@ async function start() {
     const hideMenuBar = Storage.get('hide-menu-bar', true) as boolean;
     window.setAutoHideMenuBar(hideMenuBar);
     window.setMenuBarVisibility(!hideMenuBar);
-    getConversationController()
+    // eslint-disable-next-line more/no-then
+    void getConversationController()
       .loadPromise()
       ?.then(() => {
         ReactDOM.render(<SessionInboxView />, document.getElementById('root'));
@@ -304,7 +308,7 @@ async function start() {
 
   // Set user's launch count.
   const prevLaunchCount = window.getSettingValue('launch-count');
-  // tslint:disable-next-line: restrict-plus-operands
+
   const launchCount = !prevLaunchCount ? 1 : prevLaunchCount + 1;
 
   window.setTheme = async newTheme => {
@@ -365,6 +369,7 @@ async function start() {
     window.setCallMediaPermissions(enabled);
   };
 
+  // eslint-disable-next-line @typescript-eslint/no-misused-promises
   window.openFromNotification = async conversationKey => {
     window.showWindow();
     if (conversationKey) {
@@ -485,13 +490,11 @@ class TextScramble {
     this.chars = '0123456789abcdef';
     this.update = this.update.bind(this);
   }
-  // tslint:disable: insecure-random
 
   public async setText(newText: string) {
     const oldText = this.el.value;
     const length = Math.max(oldText.length, newText.length);
-    // eslint-disable-next-line no-return-assign
-    // tslint:disable-next-line: promise-must-complete
+    // eslint-disable-next-line no-return-assign, no-promise-executor-return
     const promise = new Promise(resolve => (this.resolve = resolve));
     this.queue = [];
 
@@ -518,7 +521,6 @@ class TextScramble {
     let output = '';
     let complete = 0;
 
-    // tslint:disable-next-line: one-variable-per-declaration
     for (let i = 0, n = this.queue.length; i < n; i++) {
       const { from, to, start: startNumber, end } = this.queue[i];
       let { char } = this.queue[i];
diff --git a/ts/mains/password_start.tsx b/ts/mains/password_start.tsx
index fc12c504bc..b6a65176d6 100644
--- a/ts/mains/password_start.tsx
+++ b/ts/mains/password_start.tsx
@@ -1,4 +1,3 @@
-/* global $, Whisper */
 // const $body = $(document.body);
 
 import React from 'react';
diff --git a/ts/models/conversation.ts b/ts/models/conversation.ts
index 1e793508e5..2ffb16ae77 100644
--- a/ts/models/conversation.ts
+++ b/ts/models/conversation.ts
@@ -7,6 +7,7 @@ import {
   isArray,
   isEmpty,
   isEqual,
+  isFinite,
   isNumber,
   isString,
   sortBy,
@@ -14,6 +15,8 @@ import {
   uniq,
   xor,
 } from 'lodash';
+import { from_hex } from 'libsodium-wrappers-sumo';
+
 import { SignalService } from '../protobuf';
 import { getMessageQueue } from '../session';
 import { getConversationController } from '../session/conversations';
@@ -24,7 +27,7 @@ import { BlockedNumberController } from '../util';
 import { MessageModel } from './message';
 import { MessageAttributesOptionals, MessageDirection } from './messageType';
 
-import { Data } from '../../ts/data/data';
+import { Data } from '../data/data';
 import { OpenGroupRequestCommonType } from '../session/apis/open_group_api/opengroupV2/ApiUtil';
 import { OpenGroupUtils } from '../session/apis/open_group_api/utils';
 import { getOpenGroupV2FromConversationId } from '../session/apis/open_group_api/utils/OpenGroupUtils';
@@ -48,7 +51,6 @@ import {
   ReduxConversationType,
 } from '../state/ducks/conversations';
 
-import { from_hex } from 'libsodium-wrappers-sumo';
 import {
   ReplyingToMessageProps,
   SendMessageType,
@@ -148,14 +150,17 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
     this.initialPromise = Promise.resolve();
     autoBind(this);
 
+    // eslint-disable-next-line @typescript-eslint/no-misused-promises
     this.throttledBumpTyping = throttle(this.bumpTyping, 300);
     this.updateLastMessage = throttle(this.bouncyUpdateLastMessage.bind(this), 1000, {
       trailing: true,
       leading: true,
     });
 
+    // eslint-disable-next-line @typescript-eslint/no-misused-promises
     this.throttledNotify = debounce(this.notify, 2000, { maxWait: 2000, trailing: true });
     // start right away the function is called, and wait 1sec before calling it again
+    // eslint-disable-next-line @typescript-eslint/no-misused-promises
     this.markConversationRead = debounce(this.markConversationReadBouncy, 1000, {
       leading: true,
       trailing: true,
@@ -259,7 +264,6 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
     return groupAdmins && groupAdmins.length > 0 ? groupAdmins : [];
   }
 
-  // tslint:disable-next-line: cyclomatic-complexity max-func-body-length
   public getConversationModelProps(): ReduxConversationType {
     const isPublic = this.isPublic();
 
@@ -451,14 +455,14 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
   }
 
   public async queueJob(callback: () => Promise<void>) {
-    // tslint:disable-next-line: no-promise-as-boolean
     const previous = this.pending || Promise.resolve();
 
     const taskWithTimeout = createTaskWithTimeout(callback, `conversation ${this.idForLogging()}`);
 
+    // eslint-disable-next-line more/no-then
     this.pending = previous.then(taskWithTimeout, taskWithTimeout);
     const current = this.pending;
-
+    // eslint-disable-next-line more/no-then
     void current.then(() => {
       if (this.pending === current) {
         delete this.pending;
@@ -619,7 +623,6 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
       throw new TypeError(`Invalid conversation type: '${this.get('type')}'`);
     } catch (e) {
       window.log.error(`Reaction job failed id:${reaction.id} error:`, e);
-      return null;
     }
   }
 
@@ -849,12 +852,13 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
     const expireUpdate = {
       identifier: message.id,
       timestamp,
-      expireTimer: expireTimer ? expireTimer : (null as number | null),
+      expireTimer: expireTimer || (null as number | null),
     };
 
     if (this.isMe()) {
       const expirationTimerMessage = new ExpirationTimerUpdateMessage(expireUpdate);
-      return message.sendSyncMessageOnly(expirationTimerMessage);
+      await message.sendSyncMessageOnly(expirationTimerMessage);
+      return;
     }
 
     if (this.isPrivate()) {
@@ -879,7 +883,6 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
         namespace: SnodeNamespaces.ClosedGroupMessage,
       });
     }
-    return;
   }
 
   public triggerUIRefresh() {
@@ -1309,7 +1312,7 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
    *
    * Does not do anything for non public chats.
    */
-  // tslint:disable-next-line: cyclomatic-complexity
+
   public async setPollInfo(infos?: {
     active_users: number;
     read: boolean;
@@ -1412,9 +1415,8 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
     if (this.isOpenGroupV2()) {
       const openGroup = OpenGroupData.getV2OpenGroupRoom(this.id);
       return roomHasReactionsEnabled(openGroup);
-    } else {
-      return true;
     }
+    return true;
   }
 
   public async removeMessage(messageId: string) {
@@ -1573,7 +1575,7 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
       conversationId,
       iconUrl,
       isExpiringMessage,
-      message: friendRequestText ? friendRequestText : message.getNotificationText(),
+      message: friendRequestText || message.getNotificationText(),
       messageId,
       messageSentAt,
       title: friendRequestText ? '' : convo.getNicknameOrRealUsernameOrPlaceholder(),
@@ -1630,7 +1632,8 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
 
     // we do not trigger a state change here, instead we rely on the caller to do the commit once it is done with the queue of messages
     this.typingTimer = isTyping
-      ? global.setTimeout(this.clearContactTypingTimer.bind(this, sender), 15 * 1000)
+      ? // eslint-disable-next-line @typescript-eslint/no-misused-promises
+        global.setTimeout(this.clearContactTypingTimer.bind(this, sender), 15 * 1000)
       : null;
   }
 
@@ -1770,7 +1773,6 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
       throw new TypeError(`Invalid conversation type: '${this.get('type')}'`);
     } catch (e) {
       await message.saveErrors(e);
-      return null;
     }
   }
 
@@ -1789,6 +1791,7 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
     }
 
     // include our profile (displayName + avatar url + key for the recipient)
+    // eslint-disable-next-line no-param-reassign
     messageParams.lokiProfile = getOurProfile();
 
     if (!ourSignKeyBytes || !groupUrl) {
@@ -1888,12 +1891,13 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
     const oldUnreadNowRead = (await this.getUnreadByConversation(newestUnreadDate)).models;
 
     if (!oldUnreadNowRead.length) {
-      //no new messages where read, no need to do anything
+      // no new messages where read, no need to do anything
       return;
     }
 
     // Build the list of updated message models so we can mark them all as read on a single sqlite call
     const readDetails = [];
+    // eslint-disable-next-line no-restricted-syntax
     for (const nowRead of oldUnreadNowRead) {
       nowRead.markMessageReadNoCommit(readAt);
 
@@ -1911,6 +1915,7 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
     }
     const allProps: Array<MessageModelPropsWithoutConvoProps> = [];
 
+    // eslint-disable-next-line no-restricted-syntax
     for (const nowRead of oldUnreadNowRead) {
       allProps.push(nowRead.getMessageModelProps());
     }
@@ -1961,7 +1966,7 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
   }
 
   private async clearContactTypingTimer(_sender: string) {
-    if (!!this.typingTimer) {
+    if (this.typingTimer) {
       global.clearTimeout(this.typingTimer);
       this.typingTimer = null;
 
@@ -2067,7 +2072,7 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
     const typingMessage = new TypingMessage(typingParams);
 
     const device = new PubKey(recipientId);
-    getMessageQueue()
+    void getMessageQueue()
       .sendToPubKey(device, typingMessage, SnodeNamespaces.UserMessages)
       .catch(window?.log?.error);
   }
@@ -2194,21 +2199,25 @@ export async function commitConversationAndRefreshWrapper(id: string) {
     switch (variant) {
       case 'UserConfig':
         if (SessionUtilUserProfile.isUserProfileToStoreInWrapper(convo.id)) {
+          // eslint-disable-next-line no-await-in-loop
           await SessionUtilUserProfile.insertUserProfileIntoWrapper(convo.id);
         }
         break;
       case 'ContactsConfig':
         if (SessionUtilContact.isContactToStoreInWrapper(convo)) {
+          // eslint-disable-next-line no-await-in-loop
           await SessionUtilContact.insertContactFromDBIntoWrapperAndRefresh(convo.id);
         }
         break;
       case 'UserGroupsConfig':
         if (SessionUtilUserGroups.isUserGroupToStoreInWrapper(convo)) {
+          // eslint-disable-next-line no-await-in-loop
           await SessionUtilUserGroups.insertGroupsFromDBIntoWrapperAndRefresh(convo.id);
         }
         break;
       case 'ConvoInfoVolatileConfig':
         if (SessionUtilConvoInfoVolatile.isConvoToStoreInWrapper(convo)) {
+          // eslint-disable-next-line no-await-in-loop
           await SessionUtilConvoInfoVolatile.insertConvoFromDBIntoWrapperAndRefresh(convo.id);
         }
         break;
diff --git a/ts/models/message.ts b/ts/models/message.ts
index 592839993a..9ca93feb7d 100644
--- a/ts/models/message.ts
+++ b/ts/models/message.ts
@@ -1,17 +1,31 @@
 import Backbone from 'backbone';
-// tslint:disable-next-line: match-default-export-name
+
+import autoBind from 'auto-bind';
+import {
+  cloneDeep,
+  debounce,
+  groupBy,
+  isEmpty,
+  size as lodashSize,
+  map,
+  partition,
+  pick,
+  reject,
+  sortBy,
+  uniq,
+} from 'lodash';
 import filesize from 'filesize';
-import { SignalService } from '../../ts/protobuf';
-import { getMessageQueue } from '../../ts/session';
-import { getConversationController } from '../../ts/session/conversations';
-import { DataMessage } from '../../ts/session/messages/outgoing';
-import { PubKey } from '../../ts/session/types';
+import { SignalService } from '../protobuf';
+import { getMessageQueue } from '../session';
+import { getConversationController } from '../session/conversations';
+import { DataMessage } from '../session/messages/outgoing';
+import { PubKey } from '../session/types';
 import {
   uploadAttachmentsToFileServer,
   uploadLinkPreviewToFileServer,
   uploadQuoteThumbnailsToFileServer,
   UserUtils,
-} from '../../ts/session/utils';
+} from '../session/utils';
 import { ClosedGroupVisibleMessage } from '../session/messages/outgoing/visibleMessage/ClosedGroupVisibleMessage';
 import {
   DataExtractionNotificationMsg,
@@ -24,21 +38,7 @@ import {
   PropsForMessageRequestResponse,
 } from './messageType';
 
-import autoBind from 'auto-bind';
-import {
-  cloneDeep,
-  debounce,
-  groupBy,
-  isEmpty,
-  size as lodashSize,
-  map,
-  partition,
-  pick,
-  reject,
-  sortBy,
-  uniq,
-} from 'lodash';
-import { Data } from '../../ts/data/data';
+import { Data } from '../data/data';
 import { OpenGroupData } from '../data/opengroups';
 import { SettingsKey } from '../data/settings-key';
 import { isUsAnySogsFromCache } from '../session/apis/open_group_api/sogsv3/knownBlindedkeys';
@@ -92,7 +92,6 @@ import { Notifications } from '../util/notifications';
 import { Storage } from '../util/storage';
 import { ConversationModel } from './conversation';
 import { READ_MESSAGE_STATE } from './conversationAttributes';
-// tslint:disable: cyclomatic-complexity
 
 /**
  * @returns true if the array contains only a single item being 'You', 'you' or our device pubkey
@@ -187,7 +186,6 @@ export class MessageModel extends Backbone.Model<MessageAttributes> {
     const expirationTimerUpdate = this.get('expirationTimerUpdate');
 
     // eslint-disable-next-line no-bitwise
-    // tslint:disable-next-line: no-bitwise
     return Boolean(flags & expirationTimerFlag) || !isEmpty(expirationTimerUpdate);
   }
 
@@ -372,7 +370,6 @@ export class MessageModel extends Backbone.Model<MessageAttributes> {
     };
   }
 
-  // tslint:disable-next-line: cyclomatic-complexity
   public getPropsForGroupUpdateMessage(): PropsForGroupUpdate | null {
     const groupUpdate = this.getGroupUpdateAsArray();
 
@@ -448,7 +445,8 @@ export class MessageModel extends Backbone.Model<MessageAttributes> {
       return 'read';
     }
     const sent = this.get('sent');
-    // control messages we've sent, synced from the network appear to just have the sent_at field set, but our current devices also have this field set when we are just sending it... So idk how to have behavior work fine.,
+    // control messages we've sent, synced from the network appear to just have the
+    // sent_at field set, but our current devices also have this field set when we are just sending it... So idk how to have behavior work fine.,
     // TODOLATER
     // const sentAt = this.get('sent_at');
     const sentTo = this.get('sent_to') || [];
@@ -460,7 +458,6 @@ export class MessageModel extends Backbone.Model<MessageAttributes> {
     return 'sending';
   }
 
-  // tslint:disable-next-line: cyclomatic-complexity
   public getPropsForMessage(): PropsForMessageWithoutConvoProps {
     const sender = this.getSource();
     const expirationLength = this.get('expireTimer') * 1000;
@@ -593,7 +590,7 @@ export class MessageModel extends Backbone.Model<MessageAttributes> {
     } = attachment;
 
     const isVoiceMessageBool =
-      // tslint:disable-next-line: no-bitwise
+      // eslint-disable-next-line no-bitwise
       Boolean(flags && flags & SignalService.AttachmentPointer.Flags.VOICE_MESSAGE) || false;
 
     return {
@@ -786,7 +783,7 @@ export class MessageModel extends Backbone.Model<MessageAttributes> {
         window?.log?.info(
           'cannot retry send message, the corresponding conversation was not found.'
         );
-        return;
+        return null;
       }
       const { body, attachments, preview, quote, fileIdsToLink } = await this.uploadData();
 
@@ -1018,7 +1015,7 @@ export class MessageModel extends Backbone.Model<MessageAttributes> {
     // getNextExpiringMessage is used on app start to clean already expired messages which should have been removed already, but are not
     await this.setToExpire();
 
-    this.getConversation()?.refreshInMemoryDetails();
+    await this.getConversation()?.refreshInMemoryDetails();
   }
 
   public markMessageReadNoCommit(readAt: number) {
@@ -1288,7 +1285,7 @@ export function findAndFormatContact(pubkey: string): FindAndFormatContactType {
   }
 
   return {
-    pubkey: pubkey,
+    pubkey,
     avatarPath: contactModel ? contactModel.getAvatarPath() : null,
     name: contactModel?.getRealSessionUsername() || null,
     profileName,
@@ -1302,16 +1299,11 @@ export function processQuoteAttachment(attachment: any) {
   const objectUrl = thumbnail && thumbnail.objectUrl;
 
   const thumbnailWithObjectUrl =
-    !path && !objectUrl
-      ? null
-      : // tslint:disable: prefer-object-spread
-        Object.assign({}, attachment.thumbnail || {}, {
-          objectUrl: path || objectUrl,
-        });
+    !path && !objectUrl ? null : { ...(attachment.thumbnail || {}), objectUrl: path || objectUrl };
 
-  return Object.assign({}, attachment, {
+  return {
+    ...attachment,
     isVoiceMessage: isVoiceMessage(attachment),
     thumbnail: thumbnailWithObjectUrl,
-  });
-  // tslint:enable: prefer-object-spread
+  };
 }
diff --git a/ts/models/messageFactory.ts b/ts/models/messageFactory.ts
index dd5a37450b..d0ce82b535 100644
--- a/ts/models/messageFactory.ts
+++ b/ts/models/messageFactory.ts
@@ -116,6 +116,7 @@ export function markAttributesAsReadIfNeeded(messageAttributes: MessageAttribute
       latestUnreadForThisConvo?.lastRead &&
       sentAt <= latestUnreadForThisConvo.lastRead
     ) {
+      // eslint-disable-next-line no-param-reassign
       messageAttributes.unread = READ_MESSAGE_STATE.read;
     }
   }
diff --git a/ts/node/attachment_channel.ts b/ts/node/attachment_channel.ts
index 28324e4707..17a20b411c 100644
--- a/ts/node/attachment_channel.ts
+++ b/ts/node/attachment_channel.ts
@@ -4,9 +4,9 @@ import rimraf from 'rimraf';
 import path from 'path';
 import fse from 'fs-extra';
 import pify from 'pify';
+// eslint-disable-next-line import/no-named-default
 import { default as glob } from 'glob';
 
-// tslint:disable: no-console
 import { sqlNode } from './sql'; // checked - only node
 import { createDeleter, getAttachmentsPath } from '../shared/attachments/shared_attachments';
 
@@ -32,14 +32,12 @@ const deleteAll = async ({
 }) => {
   const deleteFromDisk = createDeleter(getAttachmentsPath(userDataPath));
 
-  // tslint:disable-next-line: one-variable-per-declaration
   for (let index = 0, max = attachments.length; index < max; index += 1) {
     const file = attachments[index];
     // eslint-disable-next-line no-await-in-loop
     await deleteFromDisk(file);
   }
 
-  // tslint:disable-next-line: no-console
   console.log(`deleteAll: deleted ${attachments.length} files`);
 };
 
@@ -53,7 +51,7 @@ const getAllAttachments = async (userDataPath: string) => {
 
 async function cleanupOrphanedAttachments(userDataPath: string) {
   const allAttachments = await getAllAttachments(userDataPath);
-  const orphanedAttachments = sqlNode.removeKnownAttachments(allAttachments); //sql.js
+  const orphanedAttachments = sqlNode.removeKnownAttachments(allAttachments);
   await deleteAll({
     userDataPath,
     attachments: orphanedAttachments,
@@ -82,6 +80,7 @@ export async function initAttachmentsChannel({ userDataPath }: { userDataPath: s
     }
   });
 
+  // eslint-disable-next-line @typescript-eslint/no-misused-promises
   ipcMain.on(CLEANUP_ORPHANED_ATTACHMENTS_KEY, async event => {
     try {
       await cleanupOrphanedAttachments(userDataPath);
diff --git a/ts/node/config.ts b/ts/node/config.ts
index a4a605b3b6..05f2f97f82 100644
--- a/ts/node/config.ts
+++ b/ts/node/config.ts
@@ -1,7 +1,7 @@
+/* eslint-disable no-console */
 import path from 'path';
 
 import { app } from 'electron';
-// tslint:disable: no-console
 
 let environment;
 const isPackaged = app.isPackaged;
@@ -29,9 +29,9 @@ if (environment === 'production') {
 }
 
 // We load config after we've made our modifications to NODE_ENV
-//tslint-disable no-require-imports no-var-requires
-// tslint:disable-next-line: no-require-imports no-var-requires
+// eslint-disable-next-line @typescript-eslint/no-var-requires
 const c = require('config');
+
 c.environment = environment;
 
 // Log resulting env vars in use by config
diff --git a/ts/node/config/base_config.ts b/ts/node/config/base_config.ts
index e064d867c3..a9c79e19b1 100644
--- a/ts/node/config/base_config.ts
+++ b/ts/node/config/base_config.ts
@@ -1,5 +1,4 @@
 import { readFileSync, unlinkSync, writeFileSync } from 'fs';
-// tslint:disable: no-console
 
 const ENCODING = 'utf8';
 
diff --git a/ts/node/config/user_config.ts b/ts/node/config/user_config.ts
index d3ae021e60..abd31d70d4 100644
--- a/ts/node/config/user_config.ts
+++ b/ts/node/config/user_config.ts
@@ -4,7 +4,6 @@ import process from 'process';
 import { app } from 'electron';
 
 import { start } from './base_config';
-// tslint:disable: no-console
 
 let storageProfile;
 
diff --git a/ts/node/database_utility.ts b/ts/node/database_utility.ts
index 290515796b..6ce8a86c43 100644
--- a/ts/node/database_utility.ts
+++ b/ts/node/database_utility.ts
@@ -1,12 +1,11 @@
 import { difference, omit, pick } from 'lodash';
+import * as BetterSqlite3 from '@signalapp/better-sqlite3';
 import {
   ConversationAttributes,
   ConversationAttributesWithNotSavedOnes,
   CONVERSATION_PRIORITIES,
 } from '../models/conversationAttributes';
 
-import * as BetterSqlite3 from '@signalapp/better-sqlite3';
-
 export const CONVERSATIONS_TABLE = 'conversations';
 export const MESSAGES_TABLE = 'messages';
 export const MESSAGES_FTS_TABLE = 'messages_fts';
@@ -20,7 +19,6 @@ export const CLOSED_GROUP_V2_KEY_PAIRS_TABLE = 'encryptionKeyPairsForClosedGroup
 export const LAST_HASHES_TABLE = 'lastHashes';
 
 export const HEX_KEY = /[^0-9A-Fa-f]/;
-// tslint:disable: no-console
 
 export function objectToJSON(data: Record<any, any>) {
   return JSON.stringify(data);
@@ -76,7 +74,7 @@ const allowedKeysFormatRowOfConversation = [
   'markedAsUnread',
   'priority',
 ];
-// tslint:disable: cyclomatic-complexity
+
 export function formatRowOfConversation(
   row: Record<string, any>,
   from: string,
@@ -216,7 +214,6 @@ export function assertValidConversationAttributes(
   const foundInAttributesButNotInAllowed = difference(Object.keys(data), allowedKeysTogether);
 
   if (foundInAttributesButNotInAllowed?.length) {
-    // tslint:disable-next-line: no-console
     console.error(
       `assertValidConversationAttributes: an invalid key was given in the record: ${foundInAttributesButNotInAllowed}`
     );
diff --git a/ts/node/encrypt_attachment_buffer.ts b/ts/node/encrypt_attachment_buffer.ts
index cce492e729..fa41651d04 100644
--- a/ts/node/encrypt_attachment_buffer.ts
+++ b/ts/node/encrypt_attachment_buffer.ts
@@ -26,7 +26,6 @@ export async function decryptAttachmentBufferNode(
       return messageTag.message;
     }
   } catch (e) {
-    // tslint:disable: no-console
     console.error('Failed to load the file as an encrypted one', e);
   }
   return new Uint8Array();
@@ -52,8 +51,6 @@ export async function encryptAttachmentBufferNode(
       sodium.crypto_secretstream_xchacha20poly1305_TAG_FINAL
     );
 
-    //tslint-disable restrict-plus-operands
-    // tslint:disable-next-line: restrict-plus-operands
     const encryptedBufferWithHeader = new Uint8Array(bufferOut.length + header.length);
     encryptedBufferWithHeader.set(header);
     encryptedBufferWithHeader.set(bufferOut, header.length);
diff --git a/ts/node/global_errors.ts b/ts/node/global_errors.ts
index 621f66ce5e..b0d8713aff 100644
--- a/ts/node/global_errors.ts
+++ b/ts/node/global_errors.ts
@@ -2,7 +2,6 @@ import { app, clipboard, dialog } from 'electron';
 import { redactAll } from '../util/privacy'; // checked - only node
 import { LocaleMessagesType } from './locale'; // checked - only node
 import { ConsoleCustom } from './logging'; // checked - only node
-// tslint:disable: no-console
 
 // We use hard-coded strings until we're able to update these strings from the locale.
 let quitText = 'Quit';
@@ -40,10 +39,12 @@ export const updateLocale = (messages: LocaleMessagesType) => {
 };
 
 export const setupGlobalErrorHandler = () => {
+  // eslint-disable-next-line @typescript-eslint/no-misused-promises
   process.on('uncaughtException', async error => {
     await handleError('Unhandled Error', error);
   });
 
+  // eslint-disable-next-line @typescript-eslint/no-misused-promises
   process.on('unhandledRejection', async error => {
     await handleError('Unhandled Promise Rejection', error);
   });
diff --git a/ts/node/locale.ts b/ts/node/locale.ts
index edc52b3eae..89ec89ab9f 100644
--- a/ts/node/locale.ts
+++ b/ts/node/locale.ts
@@ -16,7 +16,6 @@ function getLocaleMessages(locale: string): LocaleMessagesType {
 
   const targetFile = path.join(getAppRootPath(), '_locales', onDiskLocale, 'messages.json');
 
-  // tslint:disable-next-line: non-literal-fs-path
   return JSON.parse(fs.readFileSync(targetFile, 'utf-8'));
 }
 export type LocaleMessagesType = Record<string, string>;
diff --git a/ts/node/logging.ts b/ts/node/logging.ts
index 5ceb4bf99c..f256d4f82d 100644
--- a/ts/node/logging.ts
+++ b/ts/node/logging.ts
@@ -15,8 +15,6 @@ import { redactAll } from '../util/privacy';
 
 const LEVELS = ['fatal', 'error', 'warn', 'info', 'debug', 'trace'];
 let logger: Logger | undefined;
-// tslint:disable: non-literal-fs-path
-// tslint:disable: no-console
 
 export type ConsoleCustom = typeof console & {
   _log: (...args: any) => void;
@@ -75,6 +73,7 @@ export async function initializeLogger() {
       );
     });
 
+    // eslint-disable-next-line @typescript-eslint/no-misused-promises
     ipc.on('delete-all-logs', async event => {
       try {
         await deleteAllLogs(logPath);
@@ -101,7 +100,6 @@ async function deleteAllLogs(logPath: string) {
         }
 
         resolve(undefined);
-        return;
       }
     );
   });
@@ -216,7 +214,6 @@ async function fetchLog(logFile: string) {
       );
 
       resolve(data);
-      return;
     });
   });
 }
diff --git a/ts/node/menu.ts b/ts/node/menu.ts
index 078a88cc55..4c7573b3c6 100644
--- a/ts/node/menu.ts
+++ b/ts/node/menu.ts
@@ -1,8 +1,6 @@
-import { LocaleMessagesType } from './locale';
-
 import { isString } from 'lodash';
+import { LocaleMessagesType } from './locale';
 
-// tslint:disable-next-line: max-func-body-length
 export const createTemplate = (
   options: {
     openReleaseNotes: () => void;
@@ -153,8 +151,8 @@ export const createTemplate = (
 
   if (platform === 'darwin') {
     return updateForMac(template, messages, {
-      showAbout: showAbout,
-      showWindow: showWindow,
+      showAbout,
+      showWindow,
     });
   }
 
diff --git a/ts/node/migration/sessionMigrations.ts b/ts/node/migration/sessionMigrations.ts
index 05297e8e31..988403634c 100644
--- a/ts/node/migration/sessionMigrations.ts
+++ b/ts/node/migration/sessionMigrations.ts
@@ -1,3 +1,4 @@
+/* eslint-disable no-unused-expressions */
 import * as BetterSqlite3 from '@signalapp/better-sqlite3';
 import {
   ContactsConfigWrapperNode,
@@ -5,7 +6,7 @@ import {
   UserConfigWrapperNode,
   UserGroupsWrapperNode,
 } from 'libsession_util_nodejs';
-import { compact, isArray, isEmpty, isNumber, isString, map, pick } from 'lodash';
+import { compact, isArray, isEmpty, isFinite, isNumber, isString, map, pick } from 'lodash';
 import {
   CONVERSATION_PRIORITIES,
   ConversationAttributes,
@@ -37,7 +38,7 @@ import { sleepFor } from '../../session/utils/Promise';
 
 const hasDebugEnvVariable = Boolean(process.env.SESSION_DEBUG);
 
-// tslint:disable: no-console quotemark one-variable-per-declaration no-unused-expression
+// eslint:disable: quotemark one-variable-per-declaration no-unused-expression
 
 function getSessionSchemaVersion(db: BetterSqlite3.Database) {
   const result = db
@@ -618,7 +619,7 @@ function updateToSessionSchemaVersion20(currentVersion: number, db: BetterSqlite
     //     `SELECT * FROM ${CONVERSATIONS_TABLE} WHERE type = 'private' AND (name IS NULL or name = '') AND json_extract(json, '$.nickname') <> '';`
     //   )
     //   .all();
-    // tslint:disable-next-line: no-void-expression
+
     // (rowsToUpdate || []).forEach(r => {
     //   const obj = jsonToObject(r.json);
 
@@ -721,7 +722,6 @@ function updateToSessionSchemaVersion23(currentVersion: number, db: BetterSqlite
   console.log(`updateToSessionSchemaVersion${targetVersion}: success!`);
 }
 
-// tslint:disable-next-line: max-func-body-length
 function updateToSessionSchemaVersion24(currentVersion: number, db: BetterSqlite3.Database) {
   const targetVersion = 24;
   if (currentVersion >= targetVersion) {
@@ -921,13 +921,11 @@ function updateToSessionSchemaVersion27(currentVersion: number, db: BetterSqlite
     if (!oldConvoId) {
       return null;
     }
-    return (
-      oldConvoId
-        ?.replace(`https://${ipToRemove}`, urlToUse)
-        // tslint:disable-next-line: no-http-string
-        ?.replace(`http://${ipToRemove}`, urlToUse)
-        ?.replace(ipToRemove, urlToUse)
-    );
+    return oldConvoId
+      ?.replace(`https://${ipToRemove}`, urlToUse)
+
+      ?.replace(`http://${ipToRemove}`, urlToUse)
+      ?.replace(ipToRemove, urlToUse);
   }
 
   function getAllOpenGroupV2Conversations(instance: BetterSqlite3.Database) {
@@ -962,7 +960,6 @@ function updateToSessionSchemaVersion27(currentVersion: number, db: BetterSqlite
     return roomId;
   }
 
-  // tslint:disable-next-line: max-func-body-length
   db.transaction(() => {
     // First we want to drop the column friendRequestStatus if it is there, otherwise the transaction fails
     const rows = db.pragma(`table_info(${CONVERSATIONS_TABLE});`);
@@ -1104,7 +1101,8 @@ function updateToSessionSchemaVersion27(currentVersion: number, db: BetterSqlite
 
     /**
      * Lastly, we need to take care of messages.
-     * For duplicated rooms, we drop all the messages from the IP one. (Otherwise we would need to compare each message id to not break the PRIMARY_KEY on the messageID and those are just sogs messages).
+     * For duplicated rooms, we drop all the messages from the IP one. (Otherwise we
+     * would need to compare each message id to not break the PRIMARY_KEY on the messageID and those are just sogs messages).
      * For non duplicated rooms which got renamed to their dns ID, we override the stored conversationId in the message with the new conversationID
      */
     dropFtsAndTriggers(db);
@@ -1266,10 +1264,10 @@ function insertContactIntoContactWrapper(
             // expirationTimerSeconds: 0,
           })
         );
-      } catch (e) {
+      } catch (err2) {
         // there is nothing else we can do here
         console.error(
-          `contactsConfigWrapper.set during migration failed with ${e.message} for id: ${contact.id}. Skipping contact entirely`
+          `contactsConfigWrapper.set during migration failed with ${err2.message} for id: ${contact.id}. Skipping contact entirely`
         );
       }
     }
@@ -1897,6 +1895,7 @@ export async function updateSessionSchema(db: BetterSqlite3.Database) {
        *
        * This means that this sleepFor will only sleep for at most 600ms, even if we need to run 30 migrations.
        */
+      // eslint-disable-next-line no-await-in-loop
       await sleepFor(200); // give some time for the UI to not freeze between 2 migrations
     }
   }
diff --git a/ts/node/migration/signalMigrations.ts b/ts/node/migration/signalMigrations.ts
index 602e196cf0..6d7bddcd70 100644
--- a/ts/node/migration/signalMigrations.ts
+++ b/ts/node/migration/signalMigrations.ts
@@ -15,9 +15,9 @@ import {
 import { getAppRootPath } from '../getRootPath';
 import { updateSessionSchema } from './sessionMigrations';
 
-// tslint:disable: no-console quotemark non-literal-fs-path one-variable-per-declaration
+// eslint:disable: quotemark non-literal-fs-path one-variable-per-declaration
 const openDbOptions = {
-  // tslint:disable-next-line: no-constant-condition
+  // eslint-disable-next-line no-constant-condition
   verbose: false ? console.log : undefined,
 
   nativeBinding: path.join(
@@ -31,7 +31,7 @@ const openDbOptions = {
   ),
 };
 
-// tslint:disable: no-console one-variable-per-declaration
+// eslint:disable: one-variable-per-declaration
 
 function updateToSchemaVersion1(currentVersion: number, db: BetterSqlite3.Database) {
   if (currentVersion >= 1) {
@@ -125,7 +125,6 @@ function updateToSchemaVersion1(currentVersion: number, db: BetterSqlite3.Databa
     db.pragma('user_version = 1');
   })();
 
-  // tslint:disable: no-console
   console.log('updateToSchemaVersion1: success!');
 }
 
@@ -587,6 +586,7 @@ export function openAndMigrateDatabase(filePath: string, key: string) {
 
   // First, we try to open the database without any cipher changes
   try {
+    // eslint-disable-next-line new-cap
     db = new (BetterSqlite3 as any).default(filePath, openDbOptions);
 
     keyDatabase(db, key);
@@ -607,6 +607,7 @@ export function openAndMigrateDatabase(filePath: string, key: string) {
 
   let db1;
   try {
+    // eslint-disable-next-line new-cap
     db1 = new (BetterSqlite3 as any).default(filePath, openDbOptions);
     keyDatabase(db1, key);
 
@@ -625,6 +626,7 @@ export function openAndMigrateDatabase(filePath: string, key: string) {
   //   migrate to the latest ciphers after we've modified the defaults.
   let db2;
   try {
+    // eslint-disable-next-line new-cap
     db2 = new (BetterSqlite3 as any).default(filePath, openDbOptions);
     keyDatabase(db2, key);
 
diff --git a/ts/node/permissions.ts b/ts/node/permissions.ts
index 74b0ac129e..e1e5c4726b 100644
--- a/ts/node/permissions.ts
+++ b/ts/node/permissions.ts
@@ -1,9 +1,8 @@
 // The list of permissions is here:
 //   https://electronjs.org/docs/api/session#sessetpermissionrequesthandlerhandler
-// tslint:disable: no-console
+import { session } from 'electron';
 
 import { UserConfig } from './config/user_config';
-import { session } from 'electron';
 
 const PERMISSIONS: Record<string, boolean> = {
   // Allowed
diff --git a/ts/node/protocol_filter.ts b/ts/node/protocol_filter.ts
index 842ed12fdd..c4912b12a7 100644
--- a/ts/node/protocol_filter.ts
+++ b/ts/node/protocol_filter.ts
@@ -1,7 +1,6 @@
 import path from 'path';
 import fs from 'fs';
 import { Protocol, ProtocolRequest } from 'electron';
-// tslint:disable: no-console
 
 function eliminateAllAfterCharacter(str: string, character: string) {
   const index = str.indexOf(character);
@@ -37,7 +36,7 @@ function createFileHandler({
     const target = path.normalize(urlToPath(request.url, { isWindows }));
     // here we attempt to follow symlinks to the ultimate final path, reflective of what
     //   we do in main.js on userDataPath and installPath
-    // tslint:disable-next-line: non-literal-fs-path
+
     const realPath = fs.existsSync(target) ? fs.realpathSync(target) : target;
     // finally we do case-insensitive checks on windows
     const properCasing = isWindows ? realPath.toLowerCase() : realPath;
diff --git a/ts/node/spell_check.ts b/ts/node/spell_check.ts
index 00f73afe84..93eceab72c 100644
--- a/ts/node/spell_check.ts
+++ b/ts/node/spell_check.ts
@@ -1,5 +1,3 @@
-// tslint:disable: no-console
-
 import { BrowserWindow, Menu } from 'electron';
 import { sync as osLocaleSync } from 'os-locale';
 
diff --git a/ts/node/sql.ts b/ts/node/sql.ts
index d0d9e3dae7..c94186f3b4 100644
--- a/ts/node/sql.ts
+++ b/ts/node/sql.ts
@@ -20,6 +20,8 @@ import {
   omit,
   uniq,
 } from 'lodash';
+import { base64_variants, from_base64, to_hex } from 'libsodium-wrappers-sumo';
+
 import { ConversationAttributes } from '../models/conversationAttributes';
 import { PubKey } from '../session/types/PubKey'; // checked - only node
 import { redactAll } from '../util/privacy'; // checked - only node
@@ -71,10 +73,9 @@ import {
   isInstanceInitialized,
 } from './sqlInstance';
 import { configDumpData } from './sql_calls/config_dump';
-import { base64_variants, from_base64, to_hex } from 'libsodium-wrappers-sumo';
 import { Quote } from '../receiver/types';
 
-// tslint:disable: no-console function-name non-literal-fs-path
+// eslint:disable: function-name non-literal-fs-path
 
 const MAX_PUBKEYS_MEMBERS = 300;
 
@@ -305,7 +306,6 @@ function getAllItems() {
 }
 function removeItemById(id: string) {
   removeById(ITEMS_TABLE, id);
-  return;
 }
 
 function createOrUpdate(table: string, data: StorageItem, instance?: BetterSqlite3.Database) {
@@ -412,7 +412,7 @@ function getConversationCount() {
  * Because everytime you'll update the saveConversation with a new argument, the migration you wrote a month ago still relies on the old way.
  * Because of that, there is no `instance` argument here, and you should not add one as this is only needed during migrations (which will break if you do it)
  */
-// tslint:disable-next-line: max-func-body-length cyclomatic-complexity
+
 function saveConversation(data: ConversationAttributes): SaveConversationReturn {
   const formatted = assertValidConversationAttributes(data);
 
@@ -1066,6 +1066,7 @@ function getMessagesBySenderAndSentAt(
   const db = assertGlobalInstance();
   const rows = [];
 
+  // eslint-disable-next-line no-restricted-syntax
   for (const msgProps of propsList) {
     const { source, timestamp } = msgProps;
 
@@ -1234,7 +1235,6 @@ function getMessagesByConversation(
     const messageFound = getMessageById(messageId || firstUnread);
 
     if (messageFound && messageFound.conversationId === conversationId) {
-      // tslint:disable-next-li ne: no-shadowed-variable
       const start = Date.now();
       const msgTimestamp =
         messageFound.serverTimestamp || messageFound.sent_at || messageFound.received_at;
@@ -1646,7 +1646,6 @@ const unprocessed: UnprocessedDataNode = {
     assertGlobalInstance()
       .prepare('DELETE FROM unprocessed WHERE id = $id;')
       .run({ id });
-    return;
   },
 
   removeAllUnprocessed: () => {
@@ -1875,7 +1874,6 @@ function removeKnownAttachments(allAttachments: Array<string>) {
     forEach(messages, message => {
       const externalFiles = getExternalFilesForMessage(message);
       forEach(externalFiles, file => {
-        // tslint:disable-next-line: no-dynamic-delete
         delete lookup[file];
       });
     });
@@ -1918,7 +1916,6 @@ function removeKnownAttachments(allAttachments: Array<string>) {
       const avatar = (conversation as ConversationAttributes)?.avatarInProfile;
       const externalFiles = getExternalFilesForConversation(avatar);
       forEach(externalFiles, file => {
-        // tslint:disable-next-line: no-dynamic-delete
         delete lookup[file];
       });
     });
@@ -2295,9 +2292,7 @@ function cleanUpOldOpengroupsOnStart() {
     const allInactiveAndWithoutMessagesConvo = allInactiveConvos
       .map(c => c.id as string)
       .filter(convoId => {
-        return convoId !== ourPubkey && getMessagesCountBySender({ source: convoId }) === 0
-          ? true
-          : false;
+        return !!(convoId !== ourPubkey && getMessagesCountBySender({ source: convoId }) === 0);
       });
     if (allInactiveAndWithoutMessagesConvo.length) {
       console.info(
diff --git a/ts/node/sql_calls/config_dump.ts b/ts/node/sql_calls/config_dump.ts
index b16b6e4aba..0435979e57 100644
--- a/ts/node/sql_calls/config_dump.ts
+++ b/ts/node/sql_calls/config_dump.ts
@@ -9,6 +9,7 @@ import {
   ConfigDumpRow,
   ConfigDumpRowWithoutData,
 } from '../../types/sqlSharedTypes';
+// eslint-disable-next-line import/no-unresolved, import/extensions
 import { ConfigWrapperObjectTypes } from '../../webworker/workers/browser/libsession_worker_functions';
 import { assertGlobalInstance } from '../sqlInstance';
 
diff --git a/ts/node/sql_channel.ts b/ts/node/sql_channel.ts
index 4e4b7d8d31..1573be71bd 100644
--- a/ts/node/sql_channel.ts
+++ b/ts/node/sql_channel.ts
@@ -7,7 +7,6 @@ let initialized = false;
 
 const SQL_CHANNEL_KEY = 'sql-channel';
 const ERASE_SQL_KEY = 'erase-sql-key';
-// tslint:disable: no-console
 
 export function initializeSqlChannel() {
   if (initialized) {
diff --git a/ts/receiver/attachments.ts b/ts/receiver/attachments.ts
index d4c16f52c2..2fa56752bf 100644
--- a/ts/receiver/attachments.ts
+++ b/ts/receiver/attachments.ts
@@ -1,7 +1,7 @@
 import { omit, startsWith } from 'lodash';
 
 import { MessageModel } from '../models/message';
-import { Data } from '../../ts/data/data';
+import { Data } from '../data/data';
 import { AttachmentDownloads } from '../session/utils';
 import { ConversationModel } from '../models/conversation';
 import { OpenGroupRequestCommonType } from '../session/apis/open_group_api/opengroupV2/ApiUtil';
@@ -229,6 +229,7 @@ async function processQuoteAttachments(
 
     addedCount += 1;
 
+    // eslint-disable-next-line no-await-in-loop
     const thumbnail = await AttachmentDownloads.addJob(attachment.thumbnail, {
       messageId: message.id,
       type: 'quote',
diff --git a/ts/receiver/cache.ts b/ts/receiver/cache.ts
index 67b3fd8d37..b8a060ac54 100644
--- a/ts/receiver/cache.ts
+++ b/ts/receiver/cache.ts
@@ -1,6 +1,7 @@
+import { map, toNumber } from 'lodash';
+
 import { EnvelopePlus } from './types';
 import { StringUtils } from '../session/utils';
-import _ from 'lodash';
 import { Data } from '../data/data';
 import { UnprocessedParameter } from '../types/sqlSharedTypes';
 
@@ -47,8 +48,8 @@ async function increaseAttemptsOrRemove(
   items: Array<UnprocessedParameter>
 ): Promise<Array<UnprocessedParameter>> {
   return Promise.all(
-    _.map(items, async item => {
-      const attempts = _.toNumber(item.attempts || 0) + 1;
+    map(items, async item => {
+      const attempts = toNumber(item.attempts || 0) + 1;
 
       try {
         if (attempts >= 10) {
diff --git a/ts/receiver/closedGroups.ts b/ts/receiver/closedGroups.ts
index 1e7f0ed73b..da4d8775ce 100644
--- a/ts/receiver/closedGroups.ts
+++ b/ts/receiver/closedGroups.ts
@@ -1,4 +1,6 @@
-import { Data } from '../../ts/data/data';
+import _, { isNumber, toNumber } from 'lodash';
+
+import { Data } from '../data/data';
 import { SignalService } from '../protobuf';
 import { getMessageQueue } from '../session';
 import { getConversationController } from '../session/conversations';
@@ -10,7 +12,6 @@ import { removeFromCache } from './cache';
 import { decryptWithSessionProtocol } from './contentMessage';
 import { EnvelopePlus } from './types';
 
-import _, { isNumber, toNumber } from 'lodash';
 import { ConversationModel } from '../models/conversation';
 import { ConversationTypeEnum } from '../models/conversationAttributes';
 import { getSwarmPollingInstance } from '../session/apis/snode_api';
@@ -20,6 +21,7 @@ import { UserUtils } from '../session/utils';
 import { perfEnd, perfStart } from '../session/utils/Performance';
 import { ReleasedFeatures } from '../util/releaseFeature';
 import { Storage } from '../util/storage';
+// eslint-disable-next-line import/no-unresolved, import/extensions
 import { ConfigWrapperObjectTypes } from '../webworker/workers/browser/libsession_worker_functions';
 import { getSettingsKeyFromLibsessionWrapper } from './configMessage';
 import { ECKeyPair, HexKeyPair } from './keypairs';
@@ -258,7 +260,8 @@ export async function handleNewClosedGroup(
 
   if (envelope.senderIdentity === ourNumber.key) {
     window?.log?.warn('Dropping new closed group updatemessage from our other device.');
-    return removeFromCache(envelope);
+    await removeFromCache(envelope);
+    return;
   }
 
   const {
@@ -284,7 +287,8 @@ export async function handleNewClosedGroup(
     // not from legacy config, so this is a new closed group deposited on our swarm by a user.
     // we do not want to process it if our wrapper is more recent that that invite to group envelope.
     window.log.info('dropping invite to legacy group because our wrapper is more recent');
-    return removeFromCache(envelope);
+    await removeFromCache(envelope);
+    return;
   }
 
   if (!members.includes(ourNumber.key)) {
@@ -301,7 +305,6 @@ export async function handleNewClosedGroup(
     // if we did not left this group, just add the keypair we got if not already there
     if (!groupConvo.get('isKickedFromGroup') && !groupConvo.get('left')) {
       const ecKeyPairAlreadyExistingConvo = new ECKeyPair(
-        // tslint:disable: no-non-null-assertion
         encryptionKeyPair!.publicKey,
         encryptionKeyPair!.privateKey
       );
@@ -348,8 +351,8 @@ export async function handleNewClosedGroup(
   // We only set group admins on group creation
   const groupDetails: ClosedGroup.GroupInfo = {
     id: groupId,
-    name: name,
-    members: members,
+    name,
+    members,
     admins,
     activeAt: envelopeTimestamp,
   };
@@ -367,7 +370,7 @@ export async function handleNewClosedGroup(
   convo.updateLastMessage();
 
   await convo.commit();
-  // tslint:disable: no-non-null-assertion
+
   const ecKeyPair = new ECKeyPair(encryptionKeyPair!.publicKey, encryptionKeyPair!.privateKey);
   window?.log?.info(`Received the encryptionKeyPair for new group ${groupId}`);
 
@@ -440,7 +443,7 @@ async function handleClosedGroupEncryptionKeyPair(
   const ourWrapper = groupUpdate.wrappers.find(w => toHex(w.publicKey) === ourNumber.key);
   if (!ourWrapper) {
     window?.log?.warn(
-      `Couldn\'t find our wrapper in the encryption keypairs wrappers for group ${groupPublicKey}`
+      `Couldn't find our wrapper in the encryption keypairs wrappers for group ${groupPublicKey}`
     );
     await removeFromCache(envelope);
     return;
@@ -528,12 +531,14 @@ async function performIfValid(
   const convo = getConversationController().get(groupPublicKey);
   if (!convo) {
     window?.log?.warn('dropping message for nonexistent group');
-    return removeFromCache(envelope);
+    await removeFromCache(envelope);
+    return;
   }
 
   if (!convo) {
     window?.log?.warn('Ignoring a closed group update message (INFO) for a non-existing group');
-    return removeFromCache(envelope);
+    await removeFromCache(envelope);
+    return;
   }
 
   // Check that the message isn't from before the group was created
@@ -552,7 +557,8 @@ async function performIfValid(
     window?.log?.warn(
       'Got a group update with an older timestamp than when we joined this group last time. Dropping it.'
     );
-    return removeFromCache(envelope);
+    await removeFromCache(envelope);
+    return;
   }
 
   // Check that the sender is a member of the group (before the update)
diff --git a/ts/receiver/configMessage.ts b/ts/receiver/configMessage.ts
index e68e6476ac..4ad37d0ca7 100644
--- a/ts/receiver/configMessage.ts
+++ b/ts/receiver/configMessage.ts
@@ -1,3 +1,4 @@
+/* eslint-disable no-await-in-loop */
 import { ContactInfo } from 'libsession_util_nodejs';
 import { compact, difference, isEmpty, isNumber, toNumber } from 'lodash';
 import { ConfigDumpData } from '../data/configDump/configDump';
@@ -38,6 +39,7 @@ import {
   isSignInByLinking,
   setLastProfileUpdateTimestamp,
 } from '../util/storage';
+// eslint-disable-next-line import/no-unresolved, import/extensions
 import { ConfigWrapperObjectTypes } from '../webworker/workers/browser/libsession_worker_functions';
 import {
   ContactsWrapperActions,
@@ -134,7 +136,7 @@ async function mergeConfigsWithIncomingUpdates(
         needsPush,
         kind: LibSessionUtil.variantToKind(variant),
         publicKey,
-        latestEnvelopeTimestamp: latestEnvelopeTimestamp ? latestEnvelopeTimestamp : Date.now(),
+        latestEnvelopeTimestamp: latestEnvelopeTimestamp || Date.now(),
       };
       groupedResults.set(variant, incomingConfResult);
     }
@@ -279,7 +281,6 @@ async function deleteContactsFromDB(contactsToRemove: Array<string>) {
   }
 }
 
-// tslint:disable-next-line: cyclomatic-complexity
 async function handleContactsUpdate(result: IncomingConfResult): Promise<IncomingConfResult> {
   const us = UserUtils.getOurPubKeyStrFromCache();
 
@@ -1084,7 +1085,8 @@ async function handleConfigurationMessageLegacy(
 
   if (envelope.source !== ourPubkey) {
     window?.log?.info('Dropping configuration change from someone else than us.');
-    return removeFromCache(envelope);
+    await removeFromCache(envelope);
+    return;
   }
 
   await handleOurProfileUpdateLegacy(envelope.timestamp, configurationMessage);
diff --git a/ts/receiver/contentMessage.ts b/ts/receiver/contentMessage.ts
index ca0179a634..1a1ff95cd5 100644
--- a/ts/receiver/contentMessage.ts
+++ b/ts/receiver/contentMessage.ts
@@ -1,7 +1,8 @@
+import { compact, flatten, identity, isEmpty, isFinite, pickBy, toNumber } from 'lodash';
+
 import { handleSwarmDataMessage } from './dataMessage';
 import { EnvelopePlus } from './types';
 
-import { compact, flatten, identity, isEmpty, pickBy, toNumber } from 'lodash';
 import { SignalService } from '../protobuf';
 import { KeyPrefixType, PubKey } from '../session/types';
 import { removeFromCache, updateCacheWithDecryptedContent } from './cache';
@@ -41,7 +42,8 @@ export async function handleSwarmContentMessage(envelope: EnvelopePlus, messageH
 
     if (!plaintext) {
       return;
-    } else if (plaintext instanceof ArrayBuffer && plaintext.byteLength === 0) {
+    }
+    if (plaintext instanceof ArrayBuffer && plaintext.byteLength === 0) {
       return;
     }
     const sentAtTimestamp = toNumber(envelope.timestamp);
@@ -85,6 +87,7 @@ async function decryptForClosedGroup(envelope: EnvelopePlus) {
         }
         const encryptionKeyPair = ECKeyPair.fromHexKeyPair(hexEncryptionKeyPair);
 
+        // eslint-disable-next-line no-await-in-loop
         decryptedContent = await decryptWithSessionProtocol(
           envelope,
           envelope.content,
@@ -189,7 +192,7 @@ export async function decryptWithSessionProtocol(
   if (!isValid) {
     perfEnd(`decryptWithSessionProtocol-${envelope.id}`, 'decryptWithSessionProtocol');
 
-    throw new Error('Invalid message signature.'); //throw Error.invalidSignature
+    throw new Error('Invalid message signature.');
   }
   // 4. ) Get the sender's X25519 public key
   const senderX25519PublicKey = sodium.crypto_sign_ed25519_pk_to_curve25519(senderED25519PublicKey);
@@ -201,8 +204,10 @@ export async function decryptWithSessionProtocol(
 
   // set the sender identity on the envelope itself.
   if (isClosedGroup) {
+    // eslint-disable-next-line no-param-reassign
     envelope.senderIdentity = `${KeyPrefixType.standard}${toHex(senderX25519PublicKey)}`;
   } else {
+    // eslint-disable-next-line no-param-reassign
     envelope.source = `${KeyPrefixType.standard}${toHex(senderX25519PublicKey)}`;
   }
   perfEnd(`decryptWithSessionProtocol-${envelope.id}`, 'decryptWithSessionProtocol');
@@ -250,46 +255,41 @@ export async function decryptEnvelopeWithOurKey(
   }
 }
 
-// tslint:disable-next-line: max-func-body-length
 async function decrypt(envelope: EnvelopePlus): Promise<any> {
-  try {
-    if (envelope.content.byteLength === 0) {
-      throw new Error('Received an empty envelope.');
-    }
+  if (envelope.content.byteLength === 0) {
+    throw new Error('Received an empty envelope.');
+  }
 
-    let plaintext: ArrayBuffer | null = null;
-    switch (envelope.type) {
-      // Only SESSION_MESSAGE and CLOSED_GROUP_MESSAGE are supported
-      case SignalService.Envelope.Type.SESSION_MESSAGE:
-        plaintext = await decryptEnvelopeWithOurKey(envelope);
-        break;
-      case SignalService.Envelope.Type.CLOSED_GROUP_MESSAGE:
-        plaintext = await decryptForClosedGroup(envelope);
-        break;
-      default:
-        assertUnreachable(envelope.type, `Unknown message type:${envelope.type}`);
-    }
+  let plaintext: ArrayBuffer | null = null;
+  switch (envelope.type) {
+    // Only SESSION_MESSAGE and CLOSED_GROUP_MESSAGE are supported
+    case SignalService.Envelope.Type.SESSION_MESSAGE:
+      plaintext = await decryptEnvelopeWithOurKey(envelope);
+      break;
+    case SignalService.Envelope.Type.CLOSED_GROUP_MESSAGE:
+      plaintext = await decryptForClosedGroup(envelope);
+      break;
+    default:
+      assertUnreachable(envelope.type, `Unknown message type:${envelope.type}`);
+  }
 
-    if (!plaintext) {
-      // content could not be decrypted.
-      await removeFromCache(envelope);
-      return null;
-    }
+  if (!plaintext) {
+    // content could not be decrypted.
+    await removeFromCache(envelope);
+    return null;
+  }
 
-    perfStart(`updateCacheWithDecryptedContent-${envelope.id}`);
+  perfStart(`updateCacheWithDecryptedContent-${envelope.id}`);
 
-    await updateCacheWithDecryptedContent(envelope, plaintext).catch((error: any) => {
-      window?.log?.error(
-        'decrypt failed to save decrypted message contents to cache:',
-        error && error.stack ? error.stack : error
-      );
-    });
-    perfEnd(`updateCacheWithDecryptedContent-${envelope.id}`, 'updateCacheWithDecryptedContent');
+  await updateCacheWithDecryptedContent(envelope, plaintext).catch((error: any) => {
+    window?.log?.error(
+      'decrypt failed to save decrypted message contents to cache:',
+      error && error.stack ? error.stack : error
+    );
+  });
+  perfEnd(`updateCacheWithDecryptedContent-${envelope.id}`, 'updateCacheWithDecryptedContent');
 
-    return plaintext;
-  } catch (error) {
-    throw error;
-  }
+  return plaintext;
 }
 
 async function shouldDropIncomingPrivateMessage(sentAtTimestamp: number, envelope: EnvelopePlus) {
@@ -309,11 +309,11 @@ async function shouldDropIncomingPrivateMessage(sentAtTimestamp: number, envelop
           `received message from contact ${envelope.source} which appears to be hidden/removed in our most recent libsession contactconfig, sentAt: ${sentAtTimestamp}. Dropping it`
         );
         return true;
-      } else {
-        window.log.info(
-          `received message from contact ${envelope.source} which appears to NOT be hidden/removed in our most recent libsession contactconfig, sentAt: ${sentAtTimestamp}. `
-        );
       }
+
+      window.log.info(
+        `received message from contact ${envelope.source} which appears to NOT be hidden/removed in our most recent libsession contactconfig, sentAt: ${sentAtTimestamp}. `
+      );
     } catch (e) {
       window.log.warn(
         'ContactsWrapperActions.get in handleSwarmDataMessage failed with',
@@ -369,7 +369,6 @@ function shouldDropBlockedUserMessage(
   return !isControlDataMessageOnly;
 }
 
-// tslint:disable-next-line: cyclomatic-complexity
 export async function innerHandleSwarmContentMessage(
   envelope: EnvelopePlus,
   sentAtTimestamp: number,
@@ -401,9 +400,8 @@ export async function innerHandleSwarmContentMessage(
       if (shouldDropBlockedUserMessage(content, envelopeSource)) {
         window?.log?.info('Dropping blocked user message');
         return;
-      } else {
-        window?.log?.info('Allowing group-control message only from blocked user');
       }
+      window?.log?.info('Allowing group-control message only from blocked user');
     }
 
     // if this is a direct message, envelope.senderIdentity is undefined
@@ -412,7 +410,8 @@ export async function innerHandleSwarmContentMessage(
 
     if (isPrivateConversationMessage) {
       if (await shouldDropIncomingPrivateMessage(sentAtTimestamp, envelope)) {
-        return removeFromCache(envelope);
+        await removeFromCache(envelope);
+        return;
       }
     }
 
@@ -513,7 +512,7 @@ export async function innerHandleSwarmContentMessage(
   }
 }
 
-function onReadReceipt(readAt: number, timestamp: number, source: string) {
+async function onReadReceipt(readAt: number, timestamp: number, source: string) {
   window?.log?.info('read receipt', source, timestamp);
 
   if (!Storage.get(SettingsKey.settingsReadReceipt)) {
@@ -521,7 +520,7 @@ function onReadReceipt(readAt: number, timestamp: number, source: string) {
   }
 
   // Calling this directly so we can wait for completion
-  return ReadReceipts.onReadReceipt({
+  await ReadReceipts.onReadReceipt({
     source,
     timestamp,
     readAt,
@@ -538,6 +537,7 @@ async function handleReceiptMessage(
 
   const results = [];
   if (type === SignalService.ReceiptMessage.Type.READ) {
+    // eslint-disable-next-line no-restricted-syntax
     for (const ts of timestamp) {
       const promise = onReadReceipt(toNumber(envelope.timestamp), toNumber(ts), envelope.source);
       results.push(promise);
@@ -625,9 +625,9 @@ async function handleUnsendMessage(envelope: EnvelopePlus, unsendMessage: Signal
     ])
   )?.models?.[0];
   const messageHash = messageToDelete?.get('messageHash');
-  //#endregion
+  // #endregion
 
-  //#region executing deletion
+  // #region executing deletion
   if (messageHash && messageToDelete) {
     window.log.info('handleUnsendMessage: got a request to delete ', messageHash);
     const conversation = getConversationController().get(messageToDelete.get('conversationId'));
@@ -731,9 +731,9 @@ async function handleMessageRequestResponse(
     // this is based on the messageId as  primary key. So this should overwrite existing messages with new merged data
     await Data.saveMessages(allMessageModels.map(m => m.attributes));
 
-    // tslint:disable-next-line: prefer-for-of
     for (let index = 0; index < convosToMerge.length; index++) {
       const element = convosToMerge[index];
+      // eslint-disable-next-line no-await-in-loop
       await getConversationController().deleteBlindedContact(element.id);
     }
   }
diff --git a/ts/receiver/dataMessage.ts b/ts/receiver/dataMessage.ts
index 9bff8f2365..edea30808a 100644
--- a/ts/receiver/dataMessage.ts
+++ b/ts/receiver/dataMessage.ts
@@ -1,10 +1,12 @@
-import { SignalService } from './../protobuf';
+/* eslint-disable no-param-reassign */
+import { isEmpty, isFinite, noop, omit, toNumber } from 'lodash';
+
+import { SignalService } from '../protobuf';
 import { removeFromCache } from './cache';
 import { getEnvelopeId } from './common';
 import { EnvelopePlus } from './types';
 
-import { isEmpty, isFinite, noop, omit, toNumber } from 'lodash';
-import { Data } from '../../ts/data/data';
+import { Data } from '../data/data';
 import { ConversationModel } from '../models/conversation';
 import { getConversationController } from '../session/conversations';
 import { PubKey } from '../session/types';
@@ -99,7 +101,6 @@ export function cleanIncomingDataMessage(
   rawDataMessage: SignalService.DataMessage,
   envelope?: EnvelopePlus
 ) {
-  /* tslint:disable:no-bitwise */
   const FLAGS = SignalService.DataMessage.Flags;
 
   // Now that its decrypted, validate the message and clean it up for consumer
@@ -113,6 +114,7 @@ export function cleanIncomingDataMessage(
   if (rawDataMessage.expireTimer == null) {
     rawDataMessage.expireTimer = 0;
   }
+  // eslint-disable-next-line no-bitwise
   if (rawDataMessage.flags & FLAGS.EXPIRATION_TIMER_UPDATE) {
     rawDataMessage.body = '';
     rawDataMessage.attachments = [];
@@ -148,7 +150,7 @@ export function cleanIncomingDataMessage(
  *        * envelope.source is our pubkey (our other device has the same pubkey as us)
  *        * dataMessage.syncTarget is either the group public key OR the private conversation this message is about.
  */
-// tslint:disable-next-line: cyclomatic-complexity
+
 export async function handleSwarmDataMessage(
   envelope: EnvelopePlus,
   sentAtTimestamp: number,
@@ -171,7 +173,8 @@ export async function handleSwarmDataMessage(
   /**
    * This is a mess, but
    *
-   * 1. if syncTarget is set and this is a synced message, syncTarget holds the conversationId in which this message is addressed. This syncTarget can be a private conversation pubkey or a closed group pubkey
+   * 1. if syncTarget is set and this is a synced message, syncTarget holds the conversationId in which this message is addressed.
+   *    This syncTarget can be a private conversation pubkey or a closed group pubkey
    *
    * 2. for a closed group message, envelope.senderIdentity is the pubkey of the sender and envelope.source is the pubkey of the closed group.
    *
@@ -184,7 +187,8 @@ export async function handleSwarmDataMessage(
 
   if (isSyncedMessage && !isMe) {
     window?.log?.warn('Got a sync message from someone else than me. Dropping it.');
-    return removeFromCache(envelope);
+    await removeFromCache(envelope);
+    return;
   }
   const convoIdToAddTheMessageTo = PubKey.removeTextSecurePrefixIfNeeded(
     isSyncedMessage ? cleanDataMessage.syncTarget : envelope.source
@@ -226,12 +230,13 @@ export async function handleSwarmDataMessage(
 
   if (!messageHasVisibleContent(cleanDataMessage)) {
     window?.log?.warn(`Message ${getEnvelopeId(envelope)} ignored; it was empty`);
-    return removeFromCache(envelope);
+    await removeFromCache(envelope);
+    return;
   }
 
   if (!convoIdToAddTheMessageTo) {
     window?.log?.error('We cannot handle a message without a conversationId');
-    confirm();
+    await removeFromCache(envelope);
     return;
   }
 
@@ -255,6 +260,7 @@ export async function handleSwarmDataMessage(
     sentAtTimestamp,
     cleanDataMessage,
     convoToAddMessageTo,
+    // eslint-disable-next-line @typescript-eslint/no-misused-promises
     () => removeFromCache(envelope)
   );
 }
diff --git a/ts/receiver/queuedJob.ts b/ts/receiver/queuedJob.ts
index 004f72327b..1c1623cad8 100644
--- a/ts/receiver/queuedJob.ts
+++ b/ts/receiver/queuedJob.ts
@@ -1,7 +1,8 @@
+import _ from 'lodash';
+
 import { queueAttachmentDownloads } from './attachments';
 
-import _ from 'lodash';
-import { Data } from '../../ts/data/data';
+import { Data } from '../data/data';
 import { ConversationModel } from '../models/conversation';
 import { MessageModel } from '../models/message';
 import { getConversationController } from '../session/conversations';
@@ -28,7 +29,6 @@ function contentTypeSupported(type: string): boolean {
  * You have to call msg.commit() once you are done with the handling of this message
  */
 async function copyFromQuotedMessage(
-  // tslint:disable-next-line: cyclomatic-complexity
   msg: MessageModel,
   quote?: SignalService.DataMessage.IQuote | null
 ): Promise<void> {
@@ -39,7 +39,7 @@ async function copyFromQuotedMessage(
 
   const quoteLocal: Quote = {
     attachments: attachments || null,
-    author: author,
+    author,
     id: _.toNumber(quoteId),
     text: null,
     referencedMessageNotFound: false,
diff --git a/ts/receiver/receiver.ts b/ts/receiver/receiver.ts
index 3fe5179548..15938d25e7 100644
--- a/ts/receiver/receiver.ts
+++ b/ts/receiver/receiver.ts
@@ -1,11 +1,12 @@
+/* eslint-disable more/no-then */
 import { v4 as uuidv4 } from 'uuid';
+import _ from 'lodash';
+
 import { EnvelopePlus } from './types';
-export { downloadAttachment } from './attachments';
 
 import { addToCache, getAllFromCache, getAllFromCacheForSource, removeFromCache } from './cache';
 
 // innerHandleSwarmContentMessage is only needed because of code duplication in handleDecryptedEnvelope...
-import _ from 'lodash';
 import { handleSwarmContentMessage, innerHandleSwarmContentMessage } from './contentMessage';
 
 import { Data } from '../data/data';
@@ -16,6 +17,8 @@ import { createTaskWithTimeout } from '../session/utils/TaskWithTimeout';
 import { UnprocessedParameter } from '../types/sqlSharedTypes';
 import { getEnvelopeId } from './common';
 
+export { downloadAttachment } from './attachments';
+
 const incomingMessagePromises: Array<Promise<any>> = [];
 
 async function handleSwarmEnvelope(envelope: EnvelopePlus, messageHash: string) {
@@ -90,7 +93,8 @@ async function handleRequestDetail(
     // Sender identity will be lost if we load from cache, because
     // plaintext (and protobuf.Envelope) does not have that field...
     envelope.source = inConversation;
-    // tslint:disable-next-line no-parameter-reassignment
+
+    // eslint-disable-next-line no-param-reassign
     plaintext = SignalService.Envelope.encode(envelope).finish();
     envelope.senderIdentity = senderIdentity;
   }
@@ -129,7 +133,6 @@ export function handleRequest(
   inConversation: string | null,
   messageHash: string
 ): void {
-  // tslint:disable-next-line no-promise-as-boolean
   const lastPromise = _.last(incomingMessagePromises) || Promise.resolve();
 
   const promise = handleRequestDetail(plaintext, inConversation, lastPromise, messageHash).catch(
@@ -141,7 +144,6 @@ export function handleRequest(
   incomingMessagePromises.push(promise);
 }
 
-// tslint:enable:cyclomatic-complexity max-func-body-length */
 /**
  * Used in main_renderer.js
  */
@@ -175,7 +177,6 @@ async function queueCached(item: UnprocessedParameter) {
 
     // Why do we need to do this???
     envelope.senderIdentity = envelope.senderIdentity || item.senderIdentity;
-    envelope.serverTimestamp = envelope.serverTimestamp;
 
     const { decrypted } = item;
 
diff --git a/ts/session/apis/file_server_api/FileServerApi.ts b/ts/session/apis/file_server_api/FileServerApi.ts
index 6481c085b4..b3720fa97a 100644
--- a/ts/session/apis/file_server_api/FileServerApi.ts
+++ b/ts/session/apis/file_server_api/FileServerApi.ts
@@ -5,7 +5,6 @@ import {
   parseBatchGlobalStatusCode,
 } from '../open_group_api/sogsv3/sogsV3BatchPoll';
 
-// tslint:disable-next-line: no-http-string
 export const fileServerURL = 'http://filev2.getsession.org';
 export const fileServerPubKey = 'da21e1d886c6fbaea313f75298bd64aab03a97ce985b46bb2dad9f2089c8ee59';
 const RELEASE_VERSION_ENDPOINT = '/session_version?platform=desktop';
@@ -41,7 +40,7 @@ export const uploadFileToFsWithOnionV4 = async (
   }
   const fileUrl = `${fileServerURL}${POST_GET_FILE_ENDPOINT}/${fileId}`;
   return {
-    fileId: fileId,
+    fileId,
     fileUrl,
   };
 };
diff --git a/ts/session/apis/open_group_api/opengroupV2/ApiUtil.ts b/ts/session/apis/open_group_api/opengroupV2/ApiUtil.ts
index 01e4133f48..4ba6fae61b 100644
--- a/ts/session/apis/open_group_api/opengroupV2/ApiUtil.ts
+++ b/ts/session/apis/open_group_api/opengroupV2/ApiUtil.ts
@@ -36,8 +36,6 @@ export type OpenGroupV2InfoJoinable = OpenGroupV2Info & {
   base64Data?: string;
 };
 
-// tslint:disable: no-http-string
-
 export const ourSogsLegacyIp = '116.203.70.33';
 export const ourSogsDomainName = 'open.getsession.org';
 export const ourSogsUrl = `https://${ourSogsDomainName}`;
@@ -92,8 +90,8 @@ export function hasExistingOpenGroup(server: string, roomId: string) {
   } catch (e) {
     try {
       serverUrl = new window.URL(`http://${serverLowerCase}`);
-    } catch (e) {
-      window.log.error(`hasExistingOpenGroup with ${serverNotLowerCased} with ${e.message}`);
+    } catch (err2) {
+      window.log.error(`hasExistingOpenGroup with ${serverNotLowerCased} with ${err2.message}`);
 
       return false;
     }
diff --git a/ts/session/apis/open_group_api/opengroupV2/JoinOpenGroupV2.ts b/ts/session/apis/open_group_api/opengroupV2/JoinOpenGroupV2.ts
index b7b4bd62f6..02457ad4f0 100644
--- a/ts/session/apis/open_group_api/opengroupV2/JoinOpenGroupV2.ts
+++ b/ts/session/apis/open_group_api/opengroupV2/JoinOpenGroupV2.ts
@@ -1,4 +1,3 @@
-import _ from 'lodash';
 import { OpenGroupV2Room } from '../../../../data/opengroups';
 import { ConversationModel } from '../../../../models/conversation';
 import { getConversationController } from '../../../conversations';
@@ -13,7 +12,6 @@ import {
 } from '../utils/OpenGroupUtils';
 import { hasExistingOpenGroup } from './ApiUtil';
 import { getOpenGroupManager } from './OpenGroupManagerV2';
-// tslint:disable: variable-name
 
 // Inputs that should work:
 // https://sessionopengroup.co/main?public_key=658d29b91892a2389505596b135e76a53db6e11d613a51dbd3d0816adffb231c
@@ -77,8 +75,9 @@ async function joinOpenGroupV2(
 
   if (alreadyExist) {
     window?.log?.warn('Skipping join opengroupv2: already exists');
-    return;
-  } else if (existingConvo) {
+    return undefined;
+  }
+  if (existingConvo) {
     // we already have a convo associated with it. Remove everything related to it so we start fresh
     window?.log?.warn('leaving before rejoining open group v2 room', conversationId);
 
diff --git a/ts/session/apis/open_group_api/opengroupV2/OpenGroupManagerV2.ts b/ts/session/apis/open_group_api/opengroupV2/OpenGroupManagerV2.ts
index bbf8614df6..fde16bcc9d 100644
--- a/ts/session/apis/open_group_api/opengroupV2/OpenGroupManagerV2.ts
+++ b/ts/session/apis/open_group_api/opengroupV2/OpenGroupManagerV2.ts
@@ -1,3 +1,9 @@
+/* eslint-disable no-await-in-loop */
+/* eslint-disable no-restricted-syntax */
+
+import { clone, groupBy, isEqual, uniqBy } from 'lodash';
+import autoBind from 'auto-bind';
+
 import { OpenGroupData, OpenGroupV2Room } from '../../../../data/opengroups';
 import { ConversationModel } from '../../../../models/conversation';
 import { getConversationController } from '../../../conversations';
@@ -11,8 +17,6 @@ import {
 } from './ApiUtil';
 import { OpenGroupServerPoller } from './OpenGroupServerPoller';
 
-import autoBind from 'auto-bind';
-import _, { clone, isEqual } from 'lodash';
 import {
   CONVERSATION_PRIORITIES,
   ConversationTypeEnum,
@@ -91,14 +95,14 @@ export class OpenGroupManagerV2 {
   }
 
   public addRoomToPolledRooms(roomInfos: Array<OpenGroupRequestCommonType>) {
-    const grouped = _.groupBy(roomInfos, r => r.serverUrl);
+    const grouped = groupBy(roomInfos, r => r.serverUrl);
     const groupedArray = Object.values(grouped);
 
     for (const groupedRooms of groupedArray) {
       const groupedRoomsServerUrl = groupedRooms[0].serverUrl;
       const poller = this.pollers.get(groupedRoomsServerUrl);
       if (!poller) {
-        const uniqGroupedRooms = _.uniqBy(groupedRooms, r => r.roomId);
+        const uniqGroupedRooms = uniqBy(groupedRooms, r => r.roomId);
 
         this.pollers.set(groupedRoomsServerUrl, new OpenGroupServerPoller(uniqGroupedRooms));
       } else {
diff --git a/ts/session/apis/open_group_api/opengroupV2/OpenGroupPollingUtils.ts b/ts/session/apis/open_group_api/opengroupV2/OpenGroupPollingUtils.ts
index a5237506c1..31559840ea 100644
--- a/ts/session/apis/open_group_api/opengroupV2/OpenGroupPollingUtils.ts
+++ b/ts/session/apis/open_group_api/opengroupV2/OpenGroupPollingUtils.ts
@@ -1,5 +1,6 @@
+import { compact } from 'lodash';
+
 import { OpenGroupData, OpenGroupV2Room } from '../../../../data/opengroups';
-import _, { compact } from 'lodash';
 import { OpenGroupMessageV2 } from './OpenGroupMessageV2';
 import { UserUtils } from '../../../utils';
 import { fromHexToArray } from '../../../utils/String';
@@ -36,7 +37,7 @@ const getOurOpenGroupHeaders = async (
   const signingKeys = await UserUtils.getUserED25519KeyPairBytes();
   if (!signingKeys) {
     window?.log?.error('getOurOpenGroupHeaders - Unable to get our signing keys');
-    return;
+    return undefined;
   }
 
   const nonce = (await getSodiumRenderer()).randombytes_buf(16);
diff --git a/ts/session/apis/open_group_api/opengroupV2/OpenGroupServerPoller.ts b/ts/session/apis/open_group_api/opengroupV2/OpenGroupServerPoller.ts
index 4a5ad3c4a4..d91efc1663 100644
--- a/ts/session/apis/open_group_api/opengroupV2/OpenGroupServerPoller.ts
+++ b/ts/session/apis/open_group_api/opengroupV2/OpenGroupServerPoller.ts
@@ -1,11 +1,14 @@
+/* eslint-disable no-loop-func */
+/* eslint-disable no-restricted-syntax */
 import { AbortController } from 'abort-controller';
+import { isNumber, isObject } from 'lodash';
+import autoBind from 'auto-bind';
+
 import { getOpenGroupV2ConversationId } from '../utils/OpenGroupUtils';
 import { OpenGroupRequestCommonType } from './ApiUtil';
-import _, { isNumber, isObject } from 'lodash';
 
 import { OpenGroupData } from '../../../../data/opengroups';
 import { OpenGroupMessageV2 } from './OpenGroupMessageV2';
-import autoBind from 'auto-bind';
 import { DURATION } from '../../../constants';
 import {
   batchGlobalIsSuccess,
@@ -108,6 +111,7 @@ export class OpenGroupServerPoller {
     });
 
     this.abortController = new AbortController();
+    // eslint-disable-next-line @typescript-eslint/no-misused-promises
     this.pollForEverythingTimer = global.setInterval(this.compactPoll, pollForEverythingInterval);
 
     if (this.roomIdsToPoll.size) {
@@ -339,6 +343,7 @@ export class OpenGroupServerPoller {
                 stateConversations.selectedConversation &&
                 conversationKey === stateConversations.selectedConversation
               ) {
+                // eslint-disable-next-line more/no-then
                 void openConversationWithMessages({ conversationKey, messageId: null }).then(() => {
                   window.inboxStore?.dispatch(
                     markConversationInitialLoadingInProgress({
diff --git a/ts/session/apis/open_group_api/opengroupV2/SogsFilterDuplicate.ts b/ts/session/apis/open_group_api/opengroupV2/SogsFilterDuplicate.ts
index 709bcb68f0..565c146129 100644
--- a/ts/session/apis/open_group_api/opengroupV2/SogsFilterDuplicate.ts
+++ b/ts/session/apis/open_group_api/opengroupV2/SogsFilterDuplicate.ts
@@ -23,7 +23,7 @@ export const filterDuplicatesFromDbAndIncomingV4 = async (
   const filteredInDb = await Data.filterAlreadyFetchedOpengroupMessage(
     filtered.map(m => {
       // We have confirmed these exist by filtering above.
-      // tslint:disable-next-line no-non-null-assertion
+
       return { sender: m.session_id! as string, serverTimestamp: m.posted! };
     })
   );
diff --git a/ts/session/apis/open_group_api/sogsv3/knownBlindedkeys.ts b/ts/session/apis/open_group_api/sogsv3/knownBlindedkeys.ts
index 89297d34d9..fd4e760438 100644
--- a/ts/session/apis/open_group_api/sogsv3/knownBlindedkeys.ts
+++ b/ts/session/apis/open_group_api/sogsv3/knownBlindedkeys.ts
@@ -1,9 +1,10 @@
 import { from_hex, to_hex } from 'libsodium-wrappers-sumo';
-import _, { cloneDeep, flatten, isEmpty, isEqual, isString, uniqBy } from 'lodash';
+import { crypto_sign_curve25519_pk_to_ed25519 } from 'curve25519-js';
+import { cloneDeep, flatten, isEmpty, isEqual, isString, uniqBy } from 'lodash';
+
 import { getConversationController } from '../../../conversations';
 import { LibSodiumWrappers } from '../../../crypto';
 import { KeyPrefixType, PubKey } from '../../../types';
-import { crypto_sign_curve25519_pk_to_ed25519 } from 'curve25519-js';
 import { Data } from '../../../../data/data';
 import { combineKeys, generateBlindingFactor } from '../../../utils/SodiumUtils';
 import { OpenGroupData } from '../../../../data/opengroups';
@@ -152,8 +153,6 @@ export function tryMatchBlindWithStandardKey(
   // We don't want to stop iterating even if an error happens while looking for a blind/standard match.
   // That's why we catch any errors and return false if it happens.
   try {
-    // tslint:disable: no-bitwise
-
     const sessionIdNoPrefix = PubKey.removePrefixIfNeeded(PubKey.cast(standardSessionId).key);
     const blindedIdNoPrefix = PubKey.removePrefixIfNeeded(PubKey.cast(blindedSessionId).key);
     const kBytes = generateBlindingFactor(serverPubKey, sodium);
@@ -171,6 +170,7 @@ export function tryMatchBlindWithStandardKey(
     //  For the negative, what we're going to get out of the above is simply the negative of pk1, so
     // flip the sign bit to get pk2:
     const pk2 = cloneDeep(pk1);
+    // eslint-disable-next-line no-bitwise
     pk2[31] = pk1[31] ^ 0b1000_0000;
 
     const match =
diff --git a/ts/session/apis/open_group_api/sogsv3/sogsApiV3.ts b/ts/session/apis/open_group_api/sogsv3/sogsApiV3.ts
index ea9fcc1577..d76c94e4b9 100644
--- a/ts/session/apis/open_group_api/sogsv3/sogsApiV3.ts
+++ b/ts/session/apis/open_group_api/sogsv3/sogsApiV3.ts
@@ -1,4 +1,9 @@
-import _, { compact, isArray, isEmpty, isNumber, isObject, pick } from 'lodash';
+/* eslint-disable no-restricted-syntax */
+/* eslint-disable no-await-in-loop */
+import { compact, isArray, isEmpty, isFinite, isNumber, isObject, pick } from 'lodash';
+import { base64_variants, from_base64 } from 'libsodium-wrappers-sumo';
+import { v4 } from 'uuid';
+
 import { OpenGroupData } from '../../../../data/opengroups';
 import { handleOpenGroupV4Message } from '../../../../receiver/opengroup';
 import { OpenGroupRequestCommonType } from '../opengroupV2/ApiUtil';
@@ -22,12 +27,11 @@ import {
   tryMatchBlindWithStandardKey,
 } from './knownBlindedkeys';
 import { SogsBlinding } from './sogsBlinding';
-import { base64_variants, from_base64 } from 'libsodium-wrappers-sumo';
+
 import { UserUtils } from '../../../utils';
 import { innerHandleSwarmContentMessage } from '../../../../receiver/contentMessage';
 import { EnvelopePlus } from '../../../../receiver/types';
 import { SignalService } from '../../../../protobuf';
-import { v4 } from 'uuid';
 import { removeMessagePadding } from '../../../crypto/BufferPadding';
 import { getSodiumRenderer } from '../../../crypto';
 import { handleOutboxMessageModel } from '../../../../receiver/dataMessage';
@@ -191,7 +195,6 @@ const handleSogsV3DeletedMessages = async (
   return messagesWithoutDeleted;
 };
 
-// tslint:disable-next-line: max-func-body-length cyclomatic-complexity
 const handleMessagesResponseV4 = async (
   messages: Array<OpenGroupMessageV4>,
   serverUrl: string,
@@ -268,7 +271,6 @@ const handleMessagesResponseV4 = async (
     // then we try to find matching real session ids with the blinded ids we have.
     // this is where we override the blindedId with the real one in case we already know that user real sessionId
 
-    // tslint:disable: prefer-for-of
     const messagesWithResolvedBlindedIdsIfFound = [];
     for (let index = 0; index < messagesFilteredBlindedIds.length; index++) {
       const newMessage = messagesFilteredBlindedIds[index];
@@ -350,7 +352,6 @@ type InboxOutboxResponseObject = {
   message: string; // base64 data
 };
 
-// tslint:disable-next-line: cyclomatic-complexity
 async function handleInboxOutboxMessages(
   inboxOutboxResponse: Array<InboxOutboxResponseObject>,
   serverUrl: string,
@@ -359,7 +360,7 @@ async function handleInboxOutboxMessages(
   // inbox/outbox messages are blinded so decrypt them using the blinding logic.
   // handle them as a message request after that.
   if (!inboxOutboxResponse || !isArray(inboxOutboxResponse) || inboxOutboxResponse.length === 0) {
-    //nothing to do
+    // nothing to do
     return;
   }
 
@@ -529,7 +530,7 @@ export const handleBatchPollResults = async (
     for (let index = 0; index < batchPollResults.body.length; index++) {
       const subResponse = batchPollResults.body[index] as any;
       // using subreqOptions as request type lookup,
-      //assumes batch subresponse order matches the subrequest order
+      // assumes batch subresponse order matches the subrequest order
       const subrequestOption = subrequestOptionsLookup[index];
       const responseType = subrequestOption.type;
 
diff --git a/ts/session/apis/open_group_api/sogsv3/sogsBlinding.ts b/ts/session/apis/open_group_api/sogsv3/sogsBlinding.ts
index 2f3318a6d9..d9bc2f08b5 100644
--- a/ts/session/apis/open_group_api/sogsv3/sogsBlinding.ts
+++ b/ts/session/apis/open_group_api/sogsv3/sogsBlinding.ts
@@ -1,6 +1,9 @@
+import { crypto_hash_sha512, from_hex, to_hex } from 'libsodium-wrappers-sumo';
+import { isEqual } from 'lodash';
+
 import { encode, fromUInt8ArrayToBase64, stringToUint8Array, toHex } from '../../../utils/String';
 import { concatUInt8Array, getSodiumRenderer, LibSodiumWrappers } from '../../../crypto';
-import { crypto_hash_sha512, from_hex, to_hex } from 'libsodium-wrappers-sumo';
+
 import { ByteKeyPair } from '../../../utils/User';
 import { StringUtils } from '../../../utils';
 import { KeyPrefixType, PubKey } from '../../../types';
@@ -11,7 +14,6 @@ import {
   sharedBlindedEncryptionKey,
   toX25519,
 } from '../../../utils/SodiumUtils';
-import { isEqual } from 'lodash';
 import { OnionSending } from '../../../onions/onionSend';
 
 async function getSogsSignature({
@@ -165,22 +167,20 @@ const getBlindingValues = (
   secretKey: Uint8Array;
   publicKey: Uint8Array;
 } => {
-  let ka;
-  let kA;
   const k = sodium.crypto_core_ed25519_scalar_reduce(sodium.crypto_generichash(64, serverPK));
 
   // use curve key i.e. s.privKey
   let a = sodium.crypto_sign_ed25519_sk_to_curve25519(signingKeys.privKeyBytes); // this is the equivalent of ios generatePrivateKeyScalar
 
   if (a.length > 32) {
-    window.log.warn('length of signing key is too long, cutting to 32: oldlength', length);
+    window.log.warn('length of signing key is too long, cutting to 32: oldlength', a.length);
     a = a.slice(0, 32);
   }
 
   // our blinded keypair
-  ka = sodium.crypto_core_ed25519_scalar_mul(k, a); // had to cast for some reason
+  const ka = sodium.crypto_core_ed25519_scalar_mul(k, a); // had to cast for some reason
 
-  kA = sodium.crypto_scalarmult_ed25519_base_noclamp(ka);
+  const kA = sodium.crypto_scalarmult_ed25519_base_noclamp(ka);
 
   return {
     a,
diff --git a/ts/session/apis/open_group_api/sogsv3/sogsV3BatchPoll.ts b/ts/session/apis/open_group_api/sogsv3/sogsV3BatchPoll.ts
index 776ca9e0b7..5b63d22853 100644
--- a/ts/session/apis/open_group_api/sogsv3/sogsV3BatchPoll.ts
+++ b/ts/session/apis/open_group_api/sogsv3/sogsV3BatchPoll.ts
@@ -1,3 +1,4 @@
+/* eslint-disable no-case-declarations */
 import { AbortSignal } from 'abort-controller';
 import { flatten, isEmpty, isNumber, isObject } from 'lodash';
 import { OpenGroupData } from '../../../../data/opengroups';
@@ -366,7 +367,7 @@ const getBatchRequest = async (
 
   if (!headers) {
     window?.log?.error('Unable to create headers for batch request - aborting');
-    return;
+    return undefined;
   }
 
   return {
diff --git a/ts/session/apis/open_group_api/sogsv3/sogsV3Capabilities.ts b/ts/session/apis/open_group_api/sogsv3/sogsV3Capabilities.ts
index d248c7a4bc..2e99163d71 100644
--- a/ts/session/apis/open_group_api/sogsv3/sogsV3Capabilities.ts
+++ b/ts/session/apis/open_group_api/sogsv3/sogsV3Capabilities.ts
@@ -71,7 +71,7 @@ export type ParsedMemberCount = {
 export async function fetchCapabilitiesAndUpdateRelatedRoomsOfServerUrl(serverUrl: string) {
   let relatedRooms = OpenGroupData.getV2OpenGroupRoomsByServerUrl(serverUrl);
   if (!relatedRooms || relatedRooms.length === 0) {
-    return;
+    return undefined;
   }
 
   // we actually don't do that call using batch send for now to avoid having to deal with the headers in batch poll.
@@ -83,18 +83,19 @@ export async function fetchCapabilitiesAndUpdateRelatedRoomsOfServerUrl(serverUr
     new AbortController().signal
   );
   if (!capabilities) {
-    return;
+    return undefined;
   }
   // just fetch updated data from the DB, just in case
   relatedRooms = OpenGroupData.getV2OpenGroupRoomsByServerUrl(serverUrl);
   if (!relatedRooms || relatedRooms.length === 0) {
-    return;
+    return undefined;
   }
   const newSortedCaps = capabilities.sort();
 
   await Promise.all(
     relatedRooms.map(async room => {
       if (!isEqual(newSortedCaps, room.capabilities?.sort() || '')) {
+        // eslint-disable-next-line no-param-reassign
         room.capabilities = newSortedCaps;
         await OpenGroupData.saveV2OpenGroupRoom(room);
       }
diff --git a/ts/session/apis/open_group_api/sogsv3/sogsV3ClearReaction.ts b/ts/session/apis/open_group_api/sogsv3/sogsV3ClearReaction.ts
index 292a68811f..b6aff6dbc5 100644
--- a/ts/session/apis/open_group_api/sogsv3/sogsV3ClearReaction.ts
+++ b/ts/session/apis/open_group_api/sogsv3/sogsV3ClearReaction.ts
@@ -86,9 +86,8 @@ export const clearSogsReactionByServerId = async (
     if (batchGlobalIsSuccess(result) && batchFirstSubIsSuccess(result)) {
       updateMutationCache(cacheEntry, rawMessage.seqno);
       return true;
-    } else {
-      return false;
     }
+    return false;
   } catch (e) {
     window?.log?.error("clearSogsReactionByServerId Can't decode JSON body");
   }
diff --git a/ts/session/apis/open_group_api/sogsv3/sogsV3FetchFile.ts b/ts/session/apis/open_group_api/sogsv3/sogsV3FetchFile.ts
index cd36b82b9d..e52087a459 100644
--- a/ts/session/apis/open_group_api/sogsv3/sogsV3FetchFile.ts
+++ b/ts/session/apis/open_group_api/sogsv3/sogsV3FetchFile.ts
@@ -1,5 +1,5 @@
 import AbortController, { AbortSignal } from 'abort-controller';
-import { isUndefined, toNumber } from 'lodash';
+import { isFinite, isUndefined, toNumber } from 'lodash';
 import {
   OpenGroupData,
   OpenGroupV2Room,
diff --git a/ts/session/apis/open_group_api/sogsv3/sogsV3MutationCache.ts b/ts/session/apis/open_group_api/sogsv3/sogsV3MutationCache.ts
index 2257aa1de5..e9fc9f2bdf 100644
--- a/ts/session/apis/open_group_api/sogsv3/sogsV3MutationCache.ts
+++ b/ts/session/apis/open_group_api/sogsv3/sogsV3MutationCache.ts
@@ -1,3 +1,4 @@
+/* eslint-disable no-restricted-syntax */
 /**
  * This is strictly use to resolve conflicts between local state and the opengroup poll updates
  * Currently only supports message reactions 26/08/2022
@@ -123,7 +124,6 @@ export async function processMessagesUsingCache(
           );
           break;
         case 'CLEAR':
-          // tslint:disable-next-line: no-dynamic-delete
           delete updatedReactions[reaction];
           window.log.debug(
             `SOGS Mutation Cache: Cleared all ${reaction} reactions based on the cache in ${server}/${room} for message ${message.id}`
@@ -143,6 +143,7 @@ export async function processMessagesUsingCache(
     }
   }
 
+  // eslint-disable-next-line no-param-reassign
   message.reactions = updatedReactions;
   await Reactions.handleOpenGroupMessageReactions(
     getOpenGroupV2ConversationId(server, room),
diff --git a/ts/session/apis/open_group_api/sogsv3/sogsV3RoomInfos.ts b/ts/session/apis/open_group_api/sogsv3/sogsV3RoomInfos.ts
index 5f4f340f63..1a29f16758 100644
--- a/ts/session/apis/open_group_api/sogsv3/sogsV3RoomInfos.ts
+++ b/ts/session/apis/open_group_api/sogsv3/sogsV3RoomInfos.ts
@@ -28,7 +28,7 @@ export const getAllRoomInfos = async (roomInfos: OpenGroupV2Room) => {
   const statusCode = parseBatchGlobalStatusCode(result);
 
   window?.log?.warn('getAllRoomInfos failed invalid status code:', statusCode);
-  return;
+  return undefined;
 };
 
 const parseRooms = (jsonResult?: Record<string, any>): undefined | Array<OpenGroupV2Info> => {
diff --git a/ts/session/apis/open_group_api/sogsv3/sogsV3SendMessage.ts b/ts/session/apis/open_group_api/sogsv3/sogsV3SendMessage.ts
index 286c67da96..2938c86ba0 100644
--- a/ts/session/apis/open_group_api/sogsv3/sogsV3SendMessage.ts
+++ b/ts/session/apis/open_group_api/sogsv3/sogsV3SendMessage.ts
@@ -147,5 +147,5 @@ export const sendMessageOnionV4BlindedRequest = async (
     throw new Error('Could not blinded message request, server returned invalid data');
   }
 
-  return { serverId, serverTimestamp: Math.floor(serverTimestamp * 1000) }; //timestamp are now returned with a seconds.ms syntax
+  return { serverId, serverTimestamp: Math.floor(serverTimestamp * 1000) }; // timestamp are now returned with a seconds.ms syntax
 };
diff --git a/ts/session/apis/open_group_api/sogsv3/sogsV3SendReaction.ts b/ts/session/apis/open_group_api/sogsv3/sogsV3SendReaction.ts
index a13e8f062b..b85f2e88a0 100644
--- a/ts/session/apis/open_group_api/sogsv3/sogsV3SendReaction.ts
+++ b/ts/session/apis/open_group_api/sogsv3/sogsV3SendReaction.ts
@@ -74,7 +74,6 @@ export const sendSogsReactionOnionV4 = async (
   // The SOGS endpoint supports any text input so we need to make sure we are sending a valid unicode emoji
   // for an invalid input we use https://emojipedia.org/frame-with-an-x/ as a replacement since it cannot rendered as an emoji but is valid unicode
   // NOTE emoji-mart v5.2.2 types for getEmojiDataFromNative are broken
-  // @ts-ignore
   const emoji = (getEmojiDataFromNative(reaction.emoji) as FixedBaseEmoji) ? reaction.emoji : '🖾';
   const endpoint = `/room/${room}/reaction/${reaction.id}/${emoji}`;
   const method = reaction.action === Action.REACT ? 'PUT' : 'DELETE';
diff --git a/ts/session/apis/open_group_api/utils/OpenGroupUtils.ts b/ts/session/apis/open_group_api/utils/OpenGroupUtils.ts
index d7b579f24b..d2af2e9414 100644
--- a/ts/session/apis/open_group_api/utils/OpenGroupUtils.ts
+++ b/ts/session/apis/open_group_api/utils/OpenGroupUtils.ts
@@ -1,7 +1,8 @@
-import _, { isEmpty } from 'lodash';
+import { isEmpty } from 'lodash';
 import { OpenGroupV2Room } from '../../../../data/opengroups';
 import { OpenGroupRequestCommonType } from '../opengroupV2/ApiUtil';
 
+// eslint-disable-next-line prefer-regex-literals
 const protocolRegex = new RegExp('https?://');
 
 const dot = '\\.';
@@ -25,6 +26,7 @@ const openGroupV2ServerUrlRegex = new RegExp(
  * see https://stackoverflow.com/a/9275499/1680951
  */
 export const openGroupV2CompleteURLRegex = new RegExp(
+  // eslint-disable-next-line no-useless-escape
   `^${openGroupV2ServerUrlRegex.source}\/${roomIdV2Regex}${qMark}${publicKeyParam}${publicKeyRegex}$`
 );
 
@@ -32,7 +34,7 @@ export const openGroupV2CompleteURLRegex = new RegExp(
  * Just a constant to have less 'http' everywhere.
  * This is the prefix used to identify our open groups in the conversation database (v1 or v2)
  */
-// tslint:disable-next-line: no-http-string
+
 const openGroupPrefix = 'http'; // can be http:// or https://
 
 /**
@@ -61,7 +63,6 @@ export function prefixify(server: string): string {
     return server;
   }
 
-  // tslint:disable-next-line: no-http-string
   return `http://${server}`;
 }
 
diff --git a/ts/session/apis/seed_node_api/SeedNodeAPI.ts b/ts/session/apis/seed_node_api/SeedNodeAPI.ts
index 0dc51a5fdb..bdf6c98483 100644
--- a/ts/session/apis/seed_node_api/SeedNodeAPI.ts
+++ b/ts/session/apis/seed_node_api/SeedNodeAPI.ts
@@ -1,19 +1,18 @@
-import { Constants } from '../..';
+// eslint-disable-next-line import/no-named-default
 import { default as insecureNodeFetch } from 'node-fetch';
 import https from 'https';
 import _ from 'lodash';
-
 import tls from 'tls';
-import { sha256 } from '../../crypto';
 import pRetry from 'p-retry';
+
+import { sha256 } from '../../crypto';
+import { Constants } from '../..';
 import { SeedNodeAPI } from '.';
 import { allowOnlyOneAtATime } from '../../utils/Promise';
 import { APPLICATION_JSON } from '../../../types/MIME';
 import { isLinux } from '../../../OS';
 import { Snode } from '../../../data/data';
 
-// tslint:disable: function-name
-
 /**
  * Fetch all snodes from seed nodes.
  * Exported only for tests. This is not to be used by the app directly
@@ -88,7 +87,6 @@ const getSslAgentForSeedNode = async (seedNodeHost: string, isSsl = false) => {
       throw new Error(`Unknown seed node: ${seedNodeHost}`);
   }
 
-  // tslint:disable: non-literal-fs-path
   // read the cert each time. We only run this request once for each seed node nevertheless.
   const sslOptions: https.AgentOptions = {
     // as the seed nodes are using a self signed certificate, we have to provide it here.
diff --git a/ts/session/apis/snode_api/SNodeAPI.ts b/ts/session/apis/snode_api/SNodeAPI.ts
index c666dd56f6..2eeefde012 100644
--- a/ts/session/apis/snode_api/SNodeAPI.ts
+++ b/ts/session/apis/snode_api/SNodeAPI.ts
@@ -1,3 +1,5 @@
+/* eslint-disable no-prototype-builtins */
+/* eslint-disable no-restricted-syntax */
 import { compact, sample } from 'lodash';
 import pRetry from 'p-retry';
 import { Snode } from '../../../data/data';
@@ -11,8 +13,6 @@ import { SnodeSignature } from './snodeSignatures';
 
 export const ERROR_CODE_NO_CONNECT = 'ENETUNREACH: No network connection.';
 
-// tslint:disable: max-func-body-length
-
 // TODOLATER we should merge those two functions together as they are almost exactly the same
 const forceNetworkDeletion = async (): Promise<Array<string> | null> => {
   const sodium = await getSodiumRenderer();
@@ -116,7 +116,6 @@ const forceNetworkDeletion = async (): Promise<Array<string> | null> => {
                   const deletedObj = snodeJson.deleted as Record<number, Array<string>>;
                   const hashes: Array<string> = [];
 
-                  // tslint:disable: no-for-in
                   for (const key in deletedObj) {
                     if (deletedObj.hasOwnProperty(key)) {
                       hashes.push(...deletedObj[key]);
@@ -180,7 +179,6 @@ const forceNetworkDeletion = async (): Promise<Array<string> | null> => {
   }
 };
 
-// tslint:disable-next-line: variable-name
 const TEST_getMinTimeout = () => 500;
 
 /**
diff --git a/ts/session/apis/snode_api/SnodeRequestTypes.ts b/ts/session/apis/snode_api/SnodeRequestTypes.ts
index 693fded700..67025418e4 100644
--- a/ts/session/apis/snode_api/SnodeRequestTypes.ts
+++ b/ts/session/apis/snode_api/SnodeRequestTypes.ts
@@ -113,7 +113,7 @@ export type StoreOnNodeMessage = {
 };
 
 export type StoreOnNodeSubRequest = { method: 'store'; params: StoreOnNodeParams };
-export type NetworkTimeSubRequest = { method: 'info'; params: {} };
+export type NetworkTimeSubRequest = { method: 'info'; params: object };
 
 type DeleteSigParameters = {
   pubkey: string;
@@ -158,7 +158,7 @@ export type SnodeApiSubRequests =
   | DeleteAllFromNodeSubRequest
   | UpdateExpiryOnNodeSubRequest;
 
-// tslint:disable: array-type
+// eslint-disable-next-line @typescript-eslint/array-type
 export type NonEmptyArray<T> = [T, ...T[]];
 
 export type NotEmptyArrayOfBatchResults = NonEmptyArray<{
diff --git a/ts/session/apis/snode_api/batchRequest.ts b/ts/session/apis/snode_api/batchRequest.ts
index 94ed2b979b..86f6b7695d 100644
--- a/ts/session/apis/snode_api/batchRequest.ts
+++ b/ts/session/apis/snode_api/batchRequest.ts
@@ -46,6 +46,7 @@ export async function doSnodeBatchRequest(
   if (decoded?.length) {
     for (let index = 0; index < decoded.length; index++) {
       const resultRow = decoded[index];
+      // eslint-disable-next-line no-await-in-loop
       await processOnionRequestErrorAtDestination({
         statusCode: resultRow.code,
         body: JSON.stringify(resultRow.body),
diff --git a/ts/session/apis/snode_api/expire.ts b/ts/session/apis/snode_api/expire.ts
index 0819023e0a..c47a67682d 100644
--- a/ts/session/apis/snode_api/expire.ts
+++ b/ts/session/apis/snode_api/expire.ts
@@ -1,3 +1,4 @@
+/* eslint-disable no-restricted-syntax */
 import { isEmpty, sample } from 'lodash';
 import { Snode } from '../../../data/data';
 import { getSodiumRenderer } from '../../crypto';
@@ -101,6 +102,7 @@ async function processExpirationResults(
     const expiryApplied = swarm[nodeKey].expiry;
     const signature = swarm[nodeKey].signature;
 
+    // eslint-disable-next-line no-await-in-loop
     const isValid = await verifySignature({
       pubkey,
       snodePubkey: nodeKey,
diff --git a/ts/session/apis/snode_api/getNetworkTime.ts b/ts/session/apis/snode_api/getNetworkTime.ts
index dfbb6bb5d8..086d849b6b 100644
--- a/ts/session/apis/snode_api/getNetworkTime.ts
+++ b/ts/session/apis/snode_api/getNetworkTime.ts
@@ -15,7 +15,6 @@ function getNetworkTimeSubRequests(): Array<NetworkTimeSubRequest> {
   return [request];
 }
 
-// tslint:disable-next-line: variable-name
 const getNetworkTime = async (snode: Snode): Promise<string | number> => {
   const subRequests = getNetworkTimeSubRequests();
   const result = await doSnodeBatchRequest(subRequests, snode, 4000, null);
diff --git a/ts/session/apis/snode_api/hfHandling.ts b/ts/session/apis/snode_api/hfHandling.ts
index dcd7565b66..04fd351755 100644
--- a/ts/session/apis/snode_api/hfHandling.ts
+++ b/ts/session/apis/snode_api/hfHandling.ts
@@ -12,7 +12,8 @@ const hasSeenHardfork191ItemId = 'hasSeenHardfork191';
  * this is only intended for testing. Do not call this in production.
  */
 export function resetHardForkCachedValues() {
-  hasSeenHardfork190 = hasSeenHardfork191 = undefined;
+  hasSeenHardfork190 = undefined;
+  hasSeenHardfork191 = undefined;
 }
 
 /**
diff --git a/ts/session/apis/snode_api/namespaces.ts b/ts/session/apis/snode_api/namespaces.ts
index 1adb6d5e2c..e4345401b3 100644
--- a/ts/session/apis/snode_api/namespaces.ts
+++ b/ts/session/apis/snode_api/namespaces.ts
@@ -50,6 +50,7 @@ export type SnodeNamespacesUser = PickEnum<
 /**
  * Returns true if that namespace is associated with the config of a user (not his messages, only configs)
  */
+// eslint-disable-next-line consistent-return
 function isUserConfigNamespace(namespace: SnodeNamespaces) {
   switch (namespace) {
     case SnodeNamespaces.UserMessages:
@@ -74,6 +75,7 @@ function isUserConfigNamespace(namespace: SnodeNamespaces) {
   }
 }
 
+// eslint-disable-next-line consistent-return
 function namespacePriority(namespace: SnodeNamespaces): number {
   switch (namespace) {
     case SnodeNamespaces.UserMessages:
diff --git a/ts/session/apis/snode_api/onions.ts b/ts/session/apis/snode_api/onions.ts
index 5bb089b915..d29274a490 100644
--- a/ts/session/apis/snode_api/onions.ts
+++ b/ts/session/apis/snode_api/onions.ts
@@ -1,23 +1,26 @@
+// eslint-disable-next-line import/no-named-default
 import { default as insecureNodeFetch, RequestInit, Response } from 'node-fetch';
 import https from 'https';
+import ByteBuffer from 'bytebuffer';
+import pRetry from 'p-retry';
+import { cloneDeep, isEmpty, isString, omit } from 'lodash';
+import { AbortSignal } from 'abort-controller';
+import { to_string } from 'libsodium-wrappers-sumo';
 
 import { dropSnodeFromSnodePool, dropSnodeFromSwarmIfNeeded, updateSwarmFor } from './snodePool';
-import ByteBuffer from 'bytebuffer';
+
 import { OnionPaths } from '../../onions';
 import { toHex } from '../../utils/String';
-import pRetry from 'p-retry';
 import { ed25519Str, incrementBadPathCountOrDrop } from '../../onions/onionPath';
-import { cloneDeep, isEmpty, isString, omit } from 'lodash';
-// hold the ed25519 key of a snode against the time it fails. Used to remove a snode only after a few failures (snodeFailureThreshold failures)
-let snodeFailureCount: Record<string, number> = {};
 
 import { Snode } from '../../../data/data';
 import { ERROR_CODE_NO_CONNECT } from './SNodeAPI';
 import { hrefPnServerProd } from '../push_notification_api/PnServer';
 import { callUtilsWorker } from '../../../webworker/workers/browser/util_worker_interface';
 import { encodeV4Request } from '../../onions/onionv4';
-import { AbortSignal } from 'abort-controller';
-import { to_string } from 'libsodium-wrappers-sumo';
+
+// hold the ed25519 key of a snode against the time it fails. Used to remove a snode only after a few failures (snodeFailureThreshold failures)
+let snodeFailureCount: Record<string, number> = {};
 
 export const resetSnodeFailureCount = () => {
   snodeFailureCount = {};
@@ -40,7 +43,8 @@ export const buildErrorMessageWithFailedCode = (prefix: string, code: number, su
  * The first one, on the request itself, the other one in the json returned.
  *
  * If the request failed to reach the one of the node of the onion path, the one on the request is set.
- * But if the request reaches the destination node and it fails to process the request (bad node for this pubkey), you will get a 200 on the request itself, but the json you get will contain the real status.
+ * But if the request reaches the destination node and it fails to process the request (bad node for this pubkey),
+ * you will get a 200 on the request itself, but the json you get will contain the real status.
  */
 export interface SnodeResponse {
   bodyBinary: Uint8Array | null;
@@ -173,7 +177,7 @@ async function buildOnionCtxs(
         target,
         method: 'POST',
       };
-      // tslint:disable-next-line: no-http-string
+
       if (finalRelayOptions?.protocol === 'http') {
         dest.protocol = finalRelayOptions.protocol;
         dest.port = finalRelayOptions.port || 80;
@@ -420,7 +424,8 @@ async function processOnionRequestErrorOnPath(
     try {
       cipherAsString = to_string(new Uint8Array(ciphertext));
     } catch (e) {
-      // we might actually end up often in this case here often (for all calls to a non snode, so with onionv4 we will get binary data, and the to_string above won't work as it has a custom onion v4 encoding)
+      // we might actually end up often in this case here often (for all calls to a non snode, so with onionv4 we
+      // will get binary data, and the to_string above won't work as it has a custom onion v4 encoding)
       cipherAsString = '';
     }
   }
@@ -651,7 +656,9 @@ async function processOnionResponseV4({
   const bodyBinary: Uint8Array = new Uint8Array(plaintextBuffer);
 
   // Handling of the status code of the destination is done on the calling function, because the content of the onion response needs first to be decoded.
-  // Also, we actually do not care much about the status code of the destination here, because the destination cannot be a service node (we do not support onion v4 to a snode destination, only *through* them), so there is no rebuilding of the path for a destination case possible.
+  // Also, we actually do not care much about the status code of the destination here, because the destination
+  // cannot be a service node(we do not support onion v4 to a snode destination, only * through * them),
+  // so there is no rebuilding of the path for a destination case possible.
 
   return {
     bodyBinary,
@@ -744,7 +751,8 @@ async function handle421InvalidSwarm({
  * So after this call, if the snode keeps getting errors, we won't contact it again
  *
  * @param snodeEd25519 the snode ed25519 which cause issues (this might be a nodeNotFound)
- * @param guardNodeEd25519 the guard node ed25519 of the current path in use. a nodeNoteFound ed25519 is not part of any path, so we fallback to this one if we need to increment the bad path count of the current path in use
+ * @param guardNodeEd25519 the guard node ed25519 of the current path in use. a nodeNoteFound ed25519
+ *       is not part of any path, so we fallback to this one if we need to increment the bad path count of the current path in use
  * @param associatedWith if set, we will drop this snode from the swarm of the pubkey too
  * @param isNodeNotFound if set, we will drop this snode right now as this is an invalid node for the network.
  */
diff --git a/ts/session/apis/snode_api/onsResolve.ts b/ts/session/apis/snode_api/onsResolve.ts
index 1643b3f818..2e5cef200f 100644
--- a/ts/session/apis/snode_api/onsResolve.ts
+++ b/ts/session/apis/snode_api/onsResolve.ts
@@ -56,7 +56,7 @@ async function getSessionIDForOnsName(onsNameCase: string) {
     }
     const hexEncodedCipherText = intermediate?.encrypted_value;
 
-    const isArgon2Based = !Boolean(intermediate?.nonce);
+    const isArgon2Based = !intermediate?.nonce;
     const ciphertext = fromHexToArray(hexEncodedCipherText);
     let sessionIDAsData: Uint8Array;
     let nonce: Uint8Array;
diff --git a/ts/session/apis/snode_api/sessionRpc.ts b/ts/session/apis/snode_api/sessionRpc.ts
index 3167476c6b..f453402ec9 100644
--- a/ts/session/apis/snode_api/sessionRpc.ts
+++ b/ts/session/apis/snode_api/sessionRpc.ts
@@ -1,12 +1,14 @@
+// eslint-disable-next-line import/no-named-default
 import { default as insecureNodeFetch } from 'node-fetch';
+import https from 'https';
+import { clone } from 'lodash';
 import pRetry from 'p-retry';
+
 import { HTTPError, NotFoundError } from '../../utils/errors';
 import { Snode } from '../../../data/data';
 
 import { ERROR_421_HANDLED_RETRY_REQUEST, Onions, snodeHttpsAgent, SnodeResponse } from './onions';
 import { APPLICATION_JSON } from '../../../types/MIME';
-import https from 'https';
-import { clone } from 'lodash';
 
 export interface LokiFetchOptions {
   method: 'GET' | 'POST';
@@ -119,7 +121,7 @@ export async function snodeRpc(
     targetNode: Snode;
     associatedWith: string | null;
     timeout?: number;
-  } //the user pubkey this call is for. if the onion request fails, this is used to handle the error for this user swarm for instance
+  } // the user pubkey this call is for. if the onion request fails, this is used to handle the error for this user swarm for instance
 ): Promise<undefined | SnodeResponse> {
   const url = `https://${targetNode.ip}:${targetNode.port}/storage_rpc/v1`;
 
diff --git a/ts/session/apis/snode_api/snodePool.ts b/ts/session/apis/snode_api/snodePool.ts
index 7a31d45890..f13a27e218 100644
--- a/ts/session/apis/snode_api/snodePool.ts
+++ b/ts/session/apis/snode_api/snodePool.ts
@@ -1,8 +1,8 @@
 import _, { shuffle } from 'lodash';
+import pRetry from 'p-retry';
 
 import { Data, Snode } from '../../../data/data';
 
-import pRetry from 'p-retry';
 import { ed25519Str } from '../../onions/onionPath';
 import { OnionPaths } from '../../onions';
 import { Onions, SnodePool } from '.';
@@ -36,7 +36,6 @@ export const requiredSnodesForAgreement = 24;
 
 let randomSnodePool: Array<Snode> = [];
 
-// tslint:disable-next-line: function-name
 export function TEST_resetState() {
   randomSnodePool = [];
   swarmCache.clear();
@@ -126,10 +125,10 @@ export async function forceRefreshRandomSnodePool(): Promise<Array<Snode>> {
     // if that fails to get enough snodes, even after retries, well we just have to retry later.
     try {
       await SnodePool.TEST_fetchFromSeedWithRetriesAndWriteToDb();
-    } catch (e) {
+    } catch (err2) {
       window?.log?.warn(
         'forceRefreshRandomSnodePool: Failed to fetch snode pool from seed. Fetching from seed node instead:',
-        e.message
+        err2.message
       );
     }
   }
@@ -178,7 +177,7 @@ export async function getRandomSnodePool(): Promise<Array<Snode>> {
  * It also resets the onionpaths failure count and snode failure count.
  * This function does not throw.
  */
-// tslint:disable: function-name
+
 export async function TEST_fetchFromSeedWithRetriesAndWriteToDb() {
   const seedNodes = window.getSeedNodeList();
 
diff --git a/ts/session/apis/snode_api/swarmPolling.ts b/ts/session/apis/snode_api/swarmPolling.ts
index d2a3ac9457..f185edee0f 100644
--- a/ts/session/apis/snode_api/swarmPolling.ts
+++ b/ts/session/apis/snode_api/swarmPolling.ts
@@ -1,3 +1,6 @@
+/* eslint-disable no-await-in-loop */
+/* eslint-disable more/no-then */
+/* eslint-disable @typescript-eslint/no-misused-promises */
 import { compact, concat, difference, flatten, last, sample, toNumber, uniqBy } from 'lodash';
 import { Data, Snode } from '../../../data/data';
 import { SignalService } from '../../../protobuf';
@@ -473,7 +476,7 @@ export class SwarmPolling {
       await Promise.all(
         lastMessages.map(async (lastMessage, index) => {
           if (!lastMessage) {
-            return;
+            return undefined;
           }
           return this.updateLastHash({
             edkey: snodeEdkey,
@@ -491,10 +494,8 @@ export class SwarmPolling {
         if (window.inboxStore?.getState().onionPaths.isOnline) {
           window.inboxStore?.dispatch(updateIsOnline(false));
         }
-      } else {
-        if (!window.inboxStore?.getState().onionPaths.isOnline) {
-          window.inboxStore?.dispatch(updateIsOnline(true));
-        }
+      } else if (!window.inboxStore?.getState().onionPaths.isOnline) {
+        window.inboxStore?.dispatch(updateIsOnline(true));
       }
       window?.log?.info('pollNodeForKey failed with:', e.message);
       return null;
diff --git a/ts/session/constants.ts b/ts/session/constants.ts
index 15301f05bc..dac444ea18 100644
--- a/ts/session/constants.ts
+++ b/ts/session/constants.ts
@@ -1,5 +1,3 @@
-// tslint:disable: binary-expression-operand-order
-
 const seconds = 1000;
 const minutes = seconds * 60;
 const hours = minutes * 60;
@@ -26,7 +24,6 @@ export const SWARM_POLLING_TIMEOUT = {
 };
 
 export const PROTOCOLS = {
-  // tslint:disable-next-line: no-http-string
   HTTP: 'http:',
   HTTPS: 'https:',
 };
diff --git a/ts/session/conversations/ConversationController.ts b/ts/session/conversations/ConversationController.ts
index b4b41d2942..a8995b071d 100644
--- a/ts/session/conversations/ConversationController.ts
+++ b/ts/session/conversations/ConversationController.ts
@@ -1,3 +1,8 @@
+/* eslint-disable no-await-in-loop */
+/* eslint-disable more/no-then */
+import { ConvoVolatileType } from 'libsession_util_nodejs';
+import { isEmpty, isNil } from 'lodash';
+
 import { Data } from '../../data/data';
 import { OpenGroupData } from '../../data/opengroups';
 import { ConversationCollection, ConversationModel } from '../../models/conversation';
@@ -10,7 +15,6 @@ import { getOpenGroupManager } from '../apis/open_group_api/opengroupV2/OpenGrou
 import { getSwarmFor } from '../apis/snode_api/snodePool';
 import { PubKey } from '../types';
 
-import { ConvoVolatileType } from 'libsession_util_nodejs';
 import { deleteAllMessagesByConvoIdNoConfirmation } from '../../interactions/conversationInteractions';
 import { CONVERSATION_PRIORITIES, ConversationTypeEnum } from '../../models/conversationAttributes';
 import { assertUnreachable } from '../../types/sqlSharedTypes';
@@ -26,7 +30,6 @@ import { getSwarmPollingInstance } from '../apis/snode_api';
 import { SnodeNamespaces } from '../apis/snode_api/namespaces';
 import { ClosedGroupMemberLeftMessage } from '../messages/outgoing/controlMessage/group/ClosedGroupMemberLeftMessage';
 import { UserUtils } from '../utils';
-import { isEmpty, isNil } from 'lodash';
 import { getCurrentlySelectedConversationOutsideRedux } from '../../state/selectors/conversations';
 import { removeAllClosedGroupEncryptionKeyPairs } from '../../receiver/closedGroups';
 import { OpenGroupUtils } from '../apis/open_group_api/utils';
diff --git a/ts/session/conversations/createClosedGroup.ts b/ts/session/conversations/createClosedGroup.ts
index 24d5ae0513..0b7ebd0c69 100644
--- a/ts/session/conversations/createClosedGroup.ts
+++ b/ts/session/conversations/createClosedGroup.ts
@@ -144,45 +144,45 @@ async function sendToGroupMembers(
       );
     }
     return allInvitesSent;
-  } else {
-    // Confirmation dialog that recursively calls sendToGroupMembers on resolve
-
-    window.inboxStore?.dispatch(
-      updateConfirmModal({
-        title:
-          inviteResults.length > 1
-            ? window.i18n('closedGroupInviteFailTitlePlural')
-            : window.i18n('closedGroupInviteFailTitle'),
-        message:
-          inviteResults.length > 1
-            ? window.i18n('closedGroupInviteFailMessagePlural')
-            : window.i18n('closedGroupInviteFailMessage'),
-        okText: window.i18n('closedGroupInviteOkText'),
-        onClickOk: async () => {
-          const membersToResend: Array<string> = new Array<string>();
-          inviteResults.forEach((result, index) => {
-            const member = listOfMembers[index];
-            // group invite must always contain the admin member.
-            if (result !== true || admins.includes(member)) {
-              membersToResend.push(member);
-            }
-          });
-          if (membersToResend.length > 0) {
-            const isRetrySend = true;
-            await sendToGroupMembers(
-              membersToResend,
-              groupPublicKey,
-              groupName,
-              admins,
-              encryptionKeyPair,
-              existingExpireTimer,
-              isRetrySend
-            );
-          }
-        },
-      })
-    );
   }
+  // Confirmation dialog that recursively calls sendToGroupMembers on resolve
+
+  window.inboxStore?.dispatch(
+    updateConfirmModal({
+      title:
+        inviteResults.length > 1
+          ? window.i18n('closedGroupInviteFailTitlePlural')
+          : window.i18n('closedGroupInviteFailTitle'),
+      message:
+        inviteResults.length > 1
+          ? window.i18n('closedGroupInviteFailMessagePlural')
+          : window.i18n('closedGroupInviteFailMessage'),
+      okText: window.i18n('closedGroupInviteOkText'),
+      onClickOk: async () => {
+        const membersToResend: Array<string> = new Array<string>();
+        inviteResults.forEach((result, index) => {
+          const member = listOfMembers[index];
+          // group invite must always contain the admin member.
+          if (result !== true || admins.includes(member)) {
+            membersToResend.push(member);
+          }
+        });
+        if (membersToResend.length > 0) {
+          const isRetrySend = true;
+          await sendToGroupMembers(
+            membersToResend,
+            groupPublicKey,
+            groupName,
+            admins,
+            encryptionKeyPair,
+            existingExpireTimer,
+            isRetrySend
+          );
+        }
+      },
+    })
+  );
+
   return allInvitesSent;
 }
 
diff --git a/ts/session/crypto/BufferPadding.ts b/ts/session/crypto/BufferPadding.ts
index 23931e9c79..05b23f6ff4 100644
--- a/ts/session/crypto/BufferPadding.ts
+++ b/ts/session/crypto/BufferPadding.ts
@@ -20,7 +20,8 @@ export function removeMessagePadding(paddedData: ArrayBuffer): ArrayBuffer {
       const plaintext = new Uint8Array(i);
       plaintext.set(paddedPlaintext.subarray(0, i));
       return plaintext.buffer;
-    } else if (paddedPlaintext[i] !== PADDING_BYTE) {
+    }
+    if (paddedPlaintext[i] !== PADDING_BYTE) {
       // window?.log?.warn('got a message without padding... Letting it through for now');
       return paddedPlaintext;
     }
@@ -77,6 +78,7 @@ export function addAttachmentPadding(data: ArrayBuffer): ArrayBuffer {
 
   let paddedSize = Math.max(
     541,
+    // eslint-disable-next-line prefer-exponentiation-operator, no-restricted-properties
     Math.floor(Math.pow(1.05, Math.ceil(Math.log(originalUInt.length) / Math.log(1.05))))
   );
 
diff --git a/ts/session/crypto/DecryptedAttachmentsManager.ts b/ts/session/crypto/DecryptedAttachmentsManager.ts
index 9dbffe79fd..88e04b9dfa 100644
--- a/ts/session/crypto/DecryptedAttachmentsManager.ts
+++ b/ts/session/crypto/DecryptedAttachmentsManager.ts
@@ -1,3 +1,7 @@
+/* eslint-disable import/no-import-module-exports */
+/* eslint-disable no-async-promise-executor */
+/* eslint-disable @typescript-eslint/no-misused-promises */
+/* eslint-disable no-restricted-syntax */
 /**
  * This file handles attachments for us.
  * If the attachment filepath is an encrypted one. It will decrypt it, cache it, and return the blob url to it.
@@ -5,9 +9,11 @@
  *
  *
  */
+import { reject } from 'lodash';
 
 import * as fse from 'fs-extra';
 import path from 'path';
+
 import { DURATION } from '../constants';
 import { makeObjectUrl, urlToBlob } from '../../types/attachments/VisualAttachment';
 import {
@@ -129,28 +135,25 @@ export const getDecryptedMediaUrl = async (
             // window.log.debug(' file decrypted :', url, ' as ', obj);
             urlToDecryptingPromise.delete(url);
             resolve(obj);
-            return;
-          } else {
-            // failed to decrypt, fallback to url image loading
-            // it might be a media we received before the update encrypting attachments locally.
-            urlToDecryptingPromise.delete(url);
-            window.log.info('error decrypting file :', url);
-            resolve(url);
-
             return;
           }
+          // failed to decrypt, fallback to url image loading
+          // it might be a media we received before the update encrypting attachments locally.
+          urlToDecryptingPromise.delete(url);
+          window.log.info('error decrypting file :', url);
+          resolve(url);
         } catch (e) {
           window.log.warn(e);
+          reject(e.message);
         }
       })
     );
 
     return urlToDecryptingPromise.get(url) as Promise<string>;
-  } else {
-    // Not sure what we got here. Just return the file.
-
-    return url;
   }
+  // Not sure what we got here. Just return the file.
+
+  return url;
 };
 
 /**
@@ -163,7 +166,8 @@ export const getAlreadyDecryptedMediaUrl = (url: string): string | null => {
   }
   if (url.startsWith('blob:')) {
     return url;
-  } else if (exports.getLocalAttachmentPath() && url.startsWith(exports.getLocalAttachmentPath())) {
+  }
+  if (exports.getLocalAttachmentPath() && url.startsWith(exports.getLocalAttachmentPath())) {
     if (urlToDecryptedBlobMap.has(url)) {
       const existing = urlToDecryptedBlobMap.get(url);
 
diff --git a/ts/session/crypto/MessageEncrypter.ts b/ts/session/crypto/MessageEncrypter.ts
index 7f570a2397..66eff65173 100644
--- a/ts/session/crypto/MessageEncrypter.ts
+++ b/ts/session/crypto/MessageEncrypter.ts
@@ -2,11 +2,12 @@ import { SignalService } from '../../protobuf';
 import { PubKey } from '../types';
 import { concatUInt8Array, getSodiumRenderer, MessageEncrypter } from '.';
 import { fromHexToArray } from '../utils/String';
-export { concatUInt8Array, getSodiumRenderer };
-import { Data } from '../../../ts/data/data';
+import { Data } from '../../data/data';
 import { UserUtils } from '../utils';
 import { addMessagePadding } from './BufferPadding';
 
+export { concatUInt8Array, getSodiumRenderer };
+
 type EncryptResult = {
   envelopeType: SignalService.Envelope.Type;
   cipherText: Uint8Array;
diff --git a/ts/session/crypto/index.ts b/ts/session/crypto/index.ts
index c2d63d5a37..dd0cde4549 100644
--- a/ts/session/crypto/index.ts
+++ b/ts/session/crypto/index.ts
@@ -1,15 +1,14 @@
+import crypto from 'crypto';
+import libsodiumwrappers from 'libsodium-wrappers-sumo';
+
 import * as MessageEncrypter from './MessageEncrypter';
 import * as DecryptedAttachmentsManager from './DecryptedAttachmentsManager';
 
-export { MessageEncrypter, DecryptedAttachmentsManager };
-import crypto from 'crypto';
-
-// libsodium-wrappers requires the `require` call to work
-// tslint:disable-next-line: no-require-imports
-import libsodiumwrappers from 'libsodium-wrappers-sumo';
 import { toHex } from '../utils/String';
 import { ECKeyPair } from '../../receiver/keypairs';
 
+export { MessageEncrypter, DecryptedAttachmentsManager };
+
 export type LibSodiumWrappers = typeof libsodiumwrappers;
 
 export async function getSodiumRenderer(): Promise<LibSodiumWrappers> {
diff --git a/ts/session/crypto/mnemonic.ts b/ts/session/crypto/mnemonic.ts
index 600e63e67a..ffac2d96b1 100644
--- a/ts/session/crypto/mnemonic.ts
+++ b/ts/session/crypto/mnemonic.ts
@@ -1,3 +1,4 @@
+/* eslint-disable camelcase */
 import crc32 from 'buffer-crc32';
 
 class MnemonicError extends Error {}
@@ -14,7 +15,7 @@ const MN_DEFAULT_WORDSET = 'english';
 
 function mn_get_checksum_index(words: Array<string>, prefixLen: number) {
   let trimmedWords = '';
-  // tslint:disable-next-line: prefer-for-of
+
   for (let i = 0; i < words.length; i++) {
     trimmedWords += words[i].slice(0, prefixLen);
   }
@@ -23,7 +24,7 @@ function mn_get_checksum_index(words: Array<string>, prefixLen: number) {
   return index;
 }
 
-export function mn_encode(str: string, wordsetName: string = MN_DEFAULT_WORDSET): string {
+export function mnEncode(str: string, wordsetName: string = MN_DEFAULT_WORDSET): string {
   const wordset = mnWords[wordsetName];
   let out = [] as Array<any>;
   const n = wordset.words.length;
@@ -52,7 +53,7 @@ function mn_swap_endian_4byte(str: string) {
   return str.slice(6, 8) + str.slice(4, 6) + str.slice(2, 4) + str.slice(0, 2);
 }
 
-export function mn_decode(str: string, wordsetName: string = MN_DEFAULT_WORDSET): string {
+export function mnDecode(str: string, wordsetName: string = MN_DEFAULT_WORDSET): string {
   const wordset = mnWords[wordsetName];
   let out = '';
   const n = wordset.words.length;
@@ -78,8 +79,9 @@ export function mn_decode(str: string, wordsetName: string = MN_DEFAULT_WORDSET)
   }
   // Decode mnemonic
   for (let i = 0; i < wlist.length; i += 3) {
-    // tslint:disable-next-line: one-variable-per-declaration
-    let w1, w2, w3;
+    let w1;
+    let w2;
+    let w3;
     if (wordset.prefixLen === 0) {
       w1 = wordset.words.indexOf(wlist[i]);
       w2 = wordset.words.indexOf(wlist[i + 1]);
@@ -92,7 +94,7 @@ export function mn_decode(str: string, wordsetName: string = MN_DEFAULT_WORDSET)
     if (w1 === -1 || w2 === -1 || w3 === -1) {
       throw new MnemonicError('invalid word in mnemonic');
     }
-    // tslint:disable-next-line: restrict-plus-operands
+
     const x = w1 + n * ((n - w1 + w2) % n) + n * n * ((n - w2 + w3) % n);
     if (x % n !== w1) {
       throw new MnemonicError(
@@ -126,8 +128,7 @@ const mnWords = {} as Record<
 >;
 mnWords.english = {
   prefixLen: 3,
-  // tslint:disable-next-line: non-literal-require
-  // tslint:disable-next-line: no-require-imports
+  // eslint-disable-next-line global-require
   words: require('../../../mnemonic_languages/english.json'),
   truncWords: [],
 };
@@ -135,9 +136,10 @@ mnWords.english = {
 export function get_languages(): Array<string> {
   return Object.keys(mnWords);
 }
-// tslint:disable: prefer-for-of
-// tslint:disable: no-for-in
+
+// eslint-disable-next-line no-restricted-syntax
 for (const i in mnWords) {
+  // eslint-disable-next-line no-prototype-builtins
   if (mnWords.hasOwnProperty(i)) {
     if (mnWords[i].prefixLen === 0) {
       continue;
diff --git a/ts/session/group/closed-group.ts b/ts/session/group/closed-group.ts
index 230fc2b680..9904766145 100644
--- a/ts/session/group/closed-group.ts
+++ b/ts/session/group/closed-group.ts
@@ -1,8 +1,7 @@
-import { PubKey } from '../types';
-
 import _ from 'lodash';
-
 import { v4 as uuidv4 } from 'uuid';
+
+import { PubKey } from '../types';
 import { getMessageQueue } from '..';
 import { Data } from '../../data/data';
 import { ConversationModel } from '../../models/conversation';
@@ -221,7 +220,7 @@ export async function updateOrCreateClosedGroup(details: GroupInfo) {
     // Note: legacy group to not support change of admins.
     type: ConversationTypeEnum.GROUP,
     active_at: details.activeAt ? details.activeAt : 0,
-    left: details.activeAt ? false : true,
+    left: !details.activeAt,
   };
 
   conversation.set(updates);
diff --git a/ts/session/messages/incoming/IncomingMessage.ts b/ts/session/messages/incoming/IncomingMessage.ts
index e489d2ca30..4e08f1d55b 100644
--- a/ts/session/messages/incoming/IncomingMessage.ts
+++ b/ts/session/messages/incoming/IncomingMessage.ts
@@ -27,7 +27,10 @@ export class IncomingMessage<T extends IncomingMessageAvailableTypes> {
    *      * for a 1o1 message, the is the sender
    *      * for a message in a group, this is the pubkey of the group (as everyone
    *            in a group send message to the group pubkey)
-   * - `authorInGroup` is only set when this message is incoming from a closed group. This is the old `senderIdentity` and is the publicKey of the sender inside the message itself once decrypted. This is the real sender of a closed group message.
+   * - `authorInGroup` is only set when this message is incoming
+   *    from a closed group. This is the old `senderIdentity` and
+   *    is the publicKey of the sender inside the message itself once
+   *    decrypted. This is the real sender of a closed group message.
    * - `message` is the data of the ContentMessage itself.
    */
   constructor({
diff --git a/ts/session/messages/outgoing/controlMessage/CallMessage.ts b/ts/session/messages/outgoing/controlMessage/CallMessage.ts
index b7ae4e5d1e..b0c2609d92 100644
--- a/ts/session/messages/outgoing/controlMessage/CallMessage.ts
+++ b/ts/session/messages/outgoing/controlMessage/CallMessage.ts
@@ -3,6 +3,7 @@ import { MessageParams } from '../Message';
 import { ContentMessage } from '..';
 import { signalservice } from '../../../../protobuf/compiled';
 import { TTL_DEFAULT } from '../../../constants';
+
 interface CallMessageParams extends MessageParams {
   type: SignalService.CallMessage.Type;
   sdpMLineIndexes?: Array<number>;
diff --git a/ts/session/messages/outgoing/controlMessage/DataExtractionNotificationMessage.ts b/ts/session/messages/outgoing/controlMessage/DataExtractionNotificationMessage.ts
index 562fb6ae16..50bf298bcb 100644
--- a/ts/session/messages/outgoing/controlMessage/DataExtractionNotificationMessage.ts
+++ b/ts/session/messages/outgoing/controlMessage/DataExtractionNotificationMessage.ts
@@ -1,7 +1,8 @@
+import { v4 as uuid } from 'uuid';
+
 import { SignalService } from '../../../../protobuf';
 import { MessageParams } from '../Message';
 import { ContentMessage } from '..';
-import { v4 as uuid } from 'uuid';
 import { PubKey } from '../../../types';
 import { getMessageQueue } from '../../..';
 import { getConversationController } from '../../../conversations';
@@ -9,6 +10,7 @@ import { UserUtils } from '../../../utils';
 import { SettingsKey } from '../../../../data/settings-key';
 import { Storage } from '../../../../util/storage';
 import { SnodeNamespaces } from '../../../apis/snode_api/namespaces';
+
 interface DataExtractionNotificationMessageParams extends MessageParams {
   referencedAttachmentTimestamp: number;
 }
diff --git a/ts/session/messages/outgoing/controlMessage/MessageRequestResponse.ts b/ts/session/messages/outgoing/controlMessage/MessageRequestResponse.ts
index dcedf52692..0bc5af5cab 100644
--- a/ts/session/messages/outgoing/controlMessage/MessageRequestResponse.ts
+++ b/ts/session/messages/outgoing/controlMessage/MessageRequestResponse.ts
@@ -4,7 +4,6 @@ import { ContentMessage } from '../ContentMessage';
 import { MessageParams } from '../Message';
 import { buildProfileForOutgoingMessage } from '../visibleMessage/VisibleMessage';
 
-// tslint:disable-next-line: no-empty-interface
 export interface MessageRequestResponseParams extends MessageParams {
   lokiProfile?: LokiProfile;
 }
diff --git a/ts/session/messages/outgoing/controlMessage/SharedConfigMessage.ts b/ts/session/messages/outgoing/controlMessage/SharedConfigMessage.ts
index 9ff10de832..487a0b6ec4 100644
--- a/ts/session/messages/outgoing/controlMessage/SharedConfigMessage.ts
+++ b/ts/session/messages/outgoing/controlMessage/SharedConfigMessage.ts
@@ -1,9 +1,9 @@
 // this is not a very good name, but a configuration message is a message sent to our other devices so sync our current public and closed groups
+import Long from 'long';
 
 import { SignalService } from '../../../../protobuf';
 import { MessageParams } from '../Message';
 import { ContentMessage } from '..';
-import Long from 'long';
 import { TTL_DEFAULT } from '../../../constants';
 
 interface SharedConfigParams extends MessageParams {
diff --git a/ts/session/messages/outgoing/controlMessage/group/ClosedGroupAddedMembersMessage.ts b/ts/session/messages/outgoing/controlMessage/group/ClosedGroupAddedMembersMessage.ts
index ca4c7461b6..c8a43a7775 100644
--- a/ts/session/messages/outgoing/controlMessage/group/ClosedGroupAddedMembersMessage.ts
+++ b/ts/session/messages/outgoing/controlMessage/group/ClosedGroupAddedMembersMessage.ts
@@ -24,7 +24,6 @@ export class ClosedGroupAddedMembersMessage extends ClosedGroupMessage {
   public dataProto(): SignalService.DataMessage {
     const dataMessage = super.dataProto();
 
-    // tslint:disable: no-non-null-assertion
     dataMessage.closedGroupControlMessage!.type =
       SignalService.DataMessage.ClosedGroupControlMessage.Type.MEMBERS_ADDED;
     dataMessage.closedGroupControlMessage!.members = this.addedMembers.map(fromHexToArray);
diff --git a/ts/session/messages/outgoing/controlMessage/group/ClosedGroupEncryptionPairMessage.ts b/ts/session/messages/outgoing/controlMessage/group/ClosedGroupEncryptionPairMessage.ts
index d22981146b..9976015d58 100644
--- a/ts/session/messages/outgoing/controlMessage/group/ClosedGroupEncryptionPairMessage.ts
+++ b/ts/session/messages/outgoing/controlMessage/group/ClosedGroupEncryptionPairMessage.ts
@@ -25,13 +25,12 @@ export class ClosedGroupEncryptionPairMessage extends ClosedGroupMessage {
   public dataProto(): SignalService.DataMessage {
     const dataMessage = super.dataProto();
 
-    // tslint:disable: no-non-null-assertion
     dataMessage.closedGroupControlMessage!.type =
       SignalService.DataMessage.ClosedGroupControlMessage.Type.ENCRYPTION_KEY_PAIR;
     dataMessage.closedGroupControlMessage!.wrappers = this.encryptedKeyPairs.map(w => {
       const { publicKey, encryptedKeyPair } = w;
       return {
-        publicKey: publicKey,
+        publicKey,
         encryptedKeyPair,
       };
     });
diff --git a/ts/session/messages/outgoing/controlMessage/group/ClosedGroupEncryptionPairReplyMessage.ts b/ts/session/messages/outgoing/controlMessage/group/ClosedGroupEncryptionPairReplyMessage.ts
index 5455337b54..c63d85f452 100644
--- a/ts/session/messages/outgoing/controlMessage/group/ClosedGroupEncryptionPairReplyMessage.ts
+++ b/ts/session/messages/outgoing/controlMessage/group/ClosedGroupEncryptionPairReplyMessage.ts
@@ -15,7 +15,7 @@ import { ClosedGroupEncryptionPairMessage } from './ClosedGroupEncryptionPairMes
 export class ClosedGroupEncryptionPairReplyMessage extends ClosedGroupEncryptionPairMessage {
   public dataProto(): SignalService.DataMessage {
     const dataMessage = super.dataProto();
-    // tslint:disable: no-non-null-assertion
+
     dataMessage.closedGroupControlMessage!.publicKey = fromHexToArray(this.groupId.key);
 
     return dataMessage;
diff --git a/ts/session/messages/outgoing/controlMessage/group/ClosedGroupMemberLeftMessage.ts b/ts/session/messages/outgoing/controlMessage/group/ClosedGroupMemberLeftMessage.ts
index 04bdce0e3a..65f335feff 100644
--- a/ts/session/messages/outgoing/controlMessage/group/ClosedGroupMemberLeftMessage.ts
+++ b/ts/session/messages/outgoing/controlMessage/group/ClosedGroupMemberLeftMessage.ts
@@ -5,7 +5,6 @@ export class ClosedGroupMemberLeftMessage extends ClosedGroupMessage {
   public dataProto(): SignalService.DataMessage {
     const dataMessage = super.dataProto();
 
-    // tslint:disable: no-non-null-assertion
     dataMessage.closedGroupControlMessage!.type =
       SignalService.DataMessage.ClosedGroupControlMessage.Type.MEMBER_LEFT;
 
diff --git a/ts/session/messages/outgoing/controlMessage/group/ClosedGroupNameChangeMessage.ts b/ts/session/messages/outgoing/controlMessage/group/ClosedGroupNameChangeMessage.ts
index 0867ad63a4..71a390c67f 100644
--- a/ts/session/messages/outgoing/controlMessage/group/ClosedGroupNameChangeMessage.ts
+++ b/ts/session/messages/outgoing/controlMessage/group/ClosedGroupNameChangeMessage.ts
@@ -23,7 +23,6 @@ export class ClosedGroupNameChangeMessage extends ClosedGroupMessage {
   public dataProto(): SignalService.DataMessage {
     const dataMessage = super.dataProto();
 
-    // tslint:disable: no-non-null-assertion
     dataMessage.closedGroupControlMessage!.type =
       SignalService.DataMessage.ClosedGroupControlMessage.Type.NAME_CHANGE;
     dataMessage.closedGroupControlMessage!.name = this.name;
diff --git a/ts/session/messages/outgoing/controlMessage/group/ClosedGroupRemovedMembersMessage.ts b/ts/session/messages/outgoing/controlMessage/group/ClosedGroupRemovedMembersMessage.ts
index 70d6c84617..019d832bcd 100644
--- a/ts/session/messages/outgoing/controlMessage/group/ClosedGroupRemovedMembersMessage.ts
+++ b/ts/session/messages/outgoing/controlMessage/group/ClosedGroupRemovedMembersMessage.ts
@@ -24,7 +24,6 @@ export class ClosedGroupRemovedMembersMessage extends ClosedGroupMessage {
   public dataProto(): SignalService.DataMessage {
     const dataMessage = super.dataProto();
 
-    // tslint:disable: no-non-null-assertion
     dataMessage.closedGroupControlMessage!.type =
       SignalService.DataMessage.ClosedGroupControlMessage.Type.MEMBERS_REMOVED;
     dataMessage.closedGroupControlMessage!.members = this.removedMembers.map(fromHexToArray);
diff --git a/ts/session/messages/outgoing/visibleMessage/ClosedGroupVisibleMessage.ts b/ts/session/messages/outgoing/visibleMessage/ClosedGroupVisibleMessage.ts
index 89a6dfa84a..11e248d765 100644
--- a/ts/session/messages/outgoing/visibleMessage/ClosedGroupVisibleMessage.ts
+++ b/ts/session/messages/outgoing/visibleMessage/ClosedGroupVisibleMessage.ts
@@ -29,7 +29,7 @@ export class ClosedGroupVisibleMessage extends ClosedGroupMessage {
     }
   }
   public dataProto(): SignalService.DataMessage {
-    //expireTimer is set in the dataProto in this call directly
+    // expireTimer is set in the dataProto in this call directly
     const dataProto = this.chatMessage.dataProto();
 
     const groupMessage = new SignalService.GroupContext();
diff --git a/ts/session/onions/onionPath.ts b/ts/session/onions/onionPath.ts
index 08254af428..245709ad10 100644
--- a/ts/session/onions/onionPath.ts
+++ b/ts/session/onions/onionPath.ts
@@ -1,22 +1,24 @@
-import { Data, Snode } from '../../../ts/data/data';
-import * as SnodePool from '../apis/snode_api/snodePool';
+/* eslint-disable import/no-mutable-exports */
+/* eslint-disable no-await-in-loop */
 import _ from 'lodash';
+import pRetry from 'p-retry';
+// eslint-disable-next-line import/no-named-default
 import { default as insecureNodeFetch } from 'node-fetch';
+
+import { Data, Snode } from '../../data/data';
+import * as SnodePool from '../apis/snode_api/snodePool';
 import { UserUtils } from '../utils';
 import { Onions, snodeHttpsAgent } from '../apis/snode_api/onions';
 import { allowOnlyOneAtATime } from '../utils/Promise';
-import pRetry from 'p-retry';
-
-const desiredGuardCount = 3;
-const minimumGuardCount = 2;
-
 import { updateOnionPaths } from '../../state/ducks/onion';
 import { ERROR_CODE_NO_CONNECT } from '../apis/snode_api/SNodeAPI';
-
-import { OnionPaths } from './';
+import { OnionPaths } from '.';
 import { APPLICATION_JSON } from '../../types/MIME';
 
+const desiredGuardCount = 3;
+const minimumGuardCount = 2;
 const ONION_REQUEST_HOPS = 3;
+
 export let onionPaths: Array<Array<Snode>> = [];
 
 /**
@@ -24,12 +26,11 @@ export let onionPaths: Array<Array<Snode>> = [];
  * @returns a copy of the onion path currently used by the app.
  *
  */
-// tslint:disable-next-line: variable-name
+
 export const TEST_getTestOnionPath = () => {
   return _.cloneDeep(onionPaths);
 };
 
-// tslint:disable-next-line: variable-name
 export const TEST_getTestguardNodes = () => {
   return _.cloneDeep(guardNodes);
 };
@@ -50,7 +51,6 @@ export const clearTestOnionPath = () => {
  */
 export let pathFailureCount: Record<string, number> = {};
 
-// tslint:disable-next-line: variable-name
 export const resetPathFailureCount = () => {
   pathFailureCount = {};
 };
@@ -204,7 +204,7 @@ export async function incrementBadPathCountOrDrop(snodeEd25519: string) {
     // this might happen if the snodeEd25519 is the one of the target snode, just increment the target snode count by 1
     await Onions.incrementBadSnodeCountOrDrop({ snodeEd25519 });
 
-    return;
+    return undefined;
   }
 
   const guardNodeEd25519 = onionPaths[pathWithSnodeIndex][0].pubkey_ed25519;
@@ -218,8 +218,6 @@ export async function incrementBadPathCountOrDrop(snodeEd25519: string) {
   window?.log?.info('handling bad path for path index', pathWithSnodeIndex);
   const oldPathFailureCount = pathFailureCount[guardNodeEd25519] || 0;
 
-  // tslint:disable: prefer-for-of
-
   const newPathFailureCount = oldPathFailureCount + 1;
   // skip the first one as the first one is the guard node.
   // a guard node is dropped when the path is dropped completely (in dropPathStartingWithGuardNode)
@@ -233,6 +231,7 @@ export async function incrementBadPathCountOrDrop(snodeEd25519: string) {
   }
   // the path is not yet THAT bad. keep it for now
   pathFailureCount[guardNodeEd25519] = newPathFailureCount;
+  return undefined;
 }
 
 /**
diff --git a/ts/session/onions/onionSend.ts b/ts/session/onions/onionSend.ts
index a678bb4fd3..48146a5bba 100644
--- a/ts/session/onions/onionSend.ts
+++ b/ts/session/onions/onionSend.ts
@@ -1,4 +1,6 @@
-// tslint:disable: cyclomatic-complexity
+import { toNumber } from 'lodash';
+import pRetry from 'p-retry';
+import { AbortSignal } from 'abort-controller';
 
 import { OnionPaths } from '.';
 import {
@@ -9,9 +11,7 @@ import {
   SnodeResponse,
   STATUS_NO_STATUS,
 } from '../apis/snode_api/onions';
-import { toNumber } from 'lodash';
 import { PROTOCOLS } from '../constants';
-import pRetry from 'p-retry';
 import { Snode } from '../../data/data';
 import { OnionV4 } from './onionv4';
 import { OpenGroupPollingUtils } from '../apis/open_group_api/opengroupV2/OpenGroupPollingUtils';
@@ -19,7 +19,6 @@ import {
   addBinaryContentTypeToHeaders,
   addJsonContentTypeToHeaders,
 } from '../apis/open_group_api/sogsv3/sogsV3SendMessage';
-import { AbortSignal } from 'abort-controller';
 import { pnServerPubkeyHex, pnServerUrl } from '../apis/push_notification_api/PnServer';
 import { fileServerPubKey, fileServerURL } from '../apis/file_server_api/FileServerApi';
 import { invalidAuthRequiresBlinding } from '../apis/open_group_api/opengroupV2/OpenGroupServerPoller';
@@ -34,7 +33,6 @@ export type OnionFetchOptions = {
 // NOTE some endpoints require decoded strings
 const endpointExceptions = ['/reaction'];
 const endpointRequiresDecoding = (url: string): string => {
-  // tslint:disable-next-line: prefer-for-of
   for (let i = 0; i < endpointExceptions.length; i++) {
     if (url.includes(endpointExceptions[i])) {
       return decodeURIComponent(url);
@@ -103,7 +101,7 @@ export type OnionV4BinarySnodeResponse = {
  * Build & send an onion v4 request to a non snode, and handle retries.
  * We actually can only send v4 request to non snode, as the snodes themselves do not support v4 request as destination.
  */
-// tslint:disable-next-line: max-func-body-length
+
 const sendViaOnionV4ToNonSnodeWithRetries = async (
   destinationX25519Key: string,
   url: URL,
diff --git a/ts/session/onions/onionv4.ts b/ts/session/onions/onionv4.ts
index 170dfa2138..096f42241c 100644
--- a/ts/session/onions/onionv4.ts
+++ b/ts/session/onions/onionv4.ts
@@ -65,7 +65,7 @@ const decodeV4Response = (snodeResponse: SnodeResponseV4): DecodedResponseV4 | u
     window?.log?.error(
       'decodeV4Response: response is missing prefix and suffix characters - Dropping response'
     );
-    return;
+    return undefined;
   }
 
   try {
diff --git a/ts/session/sending/MessageQueue.ts b/ts/session/sending/MessageQueue.ts
index af20d53916..97a0009cd1 100644
--- a/ts/session/sending/MessageQueue.ts
+++ b/ts/session/sending/MessageQueue.ts
@@ -1,7 +1,9 @@
+import { AbortController } from 'abort-controller';
+
 import { PendingMessageCache } from './PendingMessageCache';
 import { JobQueue, MessageUtils, UserUtils } from '../utils';
 import { PubKey, RawMessage } from '../types';
-import { MessageSender } from './';
+import { MessageSender } from '.';
 import { ClosedGroupMessage } from '../messages/outgoing/controlMessage/group/ClosedGroupMessage';
 import { ConfigurationMessage } from '../messages/outgoing/controlMessage/ConfigurationMessage';
 import { ClosedGroupNameChangeMessage } from '../messages/outgoing/controlMessage/group/ClosedGroupNameChangeMessage';
@@ -22,7 +24,6 @@ import { OpenGroupVisibleMessage } from '../messages/outgoing/visibleMessage/Ope
 import { UnsendMessage } from '../messages/outgoing/controlMessage/UnsendMessage';
 import { CallMessage } from '../messages/outgoing/controlMessage/CallMessage';
 import { OpenGroupMessageV2 } from '../apis/open_group_api/opengroupV2/OpenGroupMessageV2';
-import { AbortController } from 'abort-controller';
 import { sendSogsReactionOnionV4 } from '../apis/open_group_api/sogsv3/sogsV3SendReaction';
 import {
   SnodeNamespaces,
@@ -112,7 +113,7 @@ export class MessageQueue {
       }
 
       await MessageSentHandler.handlePublicMessageSentSuccess(message.identifier, {
-        serverId: serverId,
+        serverId,
         serverTimestamp: sentTimestamp,
       });
     } catch (e) {
@@ -184,7 +185,7 @@ export class MessageQueue {
   }): Promise<void> {
     let destinationPubKey: PubKey | undefined = groupPubKey;
     if (message instanceof ExpirationTimerUpdateMessage || message instanceof ClosedGroupMessage) {
-      destinationPubKey = groupPubKey ? groupPubKey : message.groupId;
+      destinationPubKey = groupPubKey || message.groupId;
     }
 
     if (!destinationPubKey) {
@@ -265,6 +266,7 @@ export class MessageQueue {
     const messages = await this.pendingMessageCache.getForDevice(device);
 
     const jobQueue = this.getJobQueue(device);
+    // eslint-disable-next-line @typescript-eslint/no-misused-promises
     messages.forEach(async message => {
       const messageId = message.identifier;
 
diff --git a/ts/session/sending/MessageSender.ts b/ts/session/sending/MessageSender.ts
index 33612d56a7..be9d1ed37a 100644
--- a/ts/session/sending/MessageSender.ts
+++ b/ts/session/sending/MessageSender.ts
@@ -2,9 +2,9 @@
 
 import { AbortController } from 'abort-controller';
 import ByteBuffer from 'bytebuffer';
-import _, { isEmpty, isNil, isString, sample } from 'lodash';
+import _, { isEmpty, isNil, isString, sample, toNumber } from 'lodash';
 import pRetry from 'p-retry';
-import { Data } from '../../../ts/data/data';
+import { Data } from '../../data/data';
 import { SignalService } from '../../protobuf';
 import { OpenGroupRequestCommonType } from '../apis/open_group_api/opengroupV2/ApiUtil';
 import { OpenGroupMessageV2 } from '../apis/open_group_api/opengroupV2/OpenGroupMessageV2';
@@ -47,7 +47,7 @@ function overwriteOutgoingTimestampWithNetworkTimestamp(message: { plainTextBuff
   const contentDecoded = SignalService.Content.decode(plainTextBuffer);
 
   const { dataMessage, dataExtractionNotification, typingMessage } = contentDecoded;
-  if (dataMessage && dataMessage.timestamp && dataMessage.timestamp > 0) {
+  if (dataMessage && dataMessage.timestamp && toNumber(dataMessage.timestamp) > 0) {
     // this is a sync message, do not overwrite the message timestamp
     if (dataMessage.syncTarget) {
       return {
@@ -60,11 +60,11 @@ function overwriteOutgoingTimestampWithNetworkTimestamp(message: { plainTextBuff
   if (
     dataExtractionNotification &&
     dataExtractionNotification.timestamp &&
-    dataExtractionNotification.timestamp > 0
+    toNumber(dataExtractionNotification.timestamp) > 0
   ) {
     dataExtractionNotification.timestamp = networkTimestamp;
   }
-  if (typingMessage && typingMessage.timestamp && typingMessage.timestamp > 0) {
+  if (typingMessage && typingMessage.timestamp && toNumber(typingMessage.timestamp) > 0) {
     typingMessage.timestamp = networkTimestamp;
   }
   const overRiddenTimestampBuffer = SignalService.Content.encode(contentDecoded).finish();
@@ -84,9 +84,8 @@ function isSyncMessage(message: ContentMessage) {
     (message as any).syncTarget?.length > 0
   ) {
     return true;
-  } else {
-    return false;
   }
+  return false;
 }
 
 /**
@@ -261,9 +260,8 @@ function encryptionBasedOnConversation(destination: PubKey) {
       ?.isClosedGroup()
   ) {
     return SignalService.Envelope.Type.CLOSED_GROUP_MESSAGE;
-  } else {
-    return SignalService.Envelope.Type.SESSION_MESSAGE;
   }
+  return SignalService.Envelope.Type.SESSION_MESSAGE;
 }
 
 type SharedEncryptAndWrap = {
diff --git a/ts/session/sending/MessageSentHandler.ts b/ts/session/sending/MessageSentHandler.ts
index da599e6e30..0f5dbcea89 100644
--- a/ts/session/sending/MessageSentHandler.ts
+++ b/ts/session/sending/MessageSentHandler.ts
@@ -40,7 +40,6 @@ async function handlePublicMessageSentSuccess(
   }
 }
 
-// tslint:disable-next-line: cyclomatic-complexity
 async function handleMessageSentSuccess(
   sentMessage: RawMessage,
   effectiveTimestamp: number,
diff --git a/ts/session/sending/PendingMessageCache.ts b/ts/session/sending/PendingMessageCache.ts
index 10b3739aac..f199dd8fd5 100644
--- a/ts/session/sending/PendingMessageCache.ts
+++ b/ts/session/sending/PendingMessageCache.ts
@@ -1,11 +1,11 @@
 import _ from 'lodash';
-import { Data } from '../../../ts/data/data';
-import { PartialRawMessage, RawMessage } from '../types/RawMessage';
+import { Data } from '../../data/data';
+import { Storage } from '../../util/storage';
+import { SnodeNamespaces } from '../apis/snode_api/namespaces';
 import { ContentMessage } from '../messages/outgoing';
 import { PubKey } from '../types';
+import { PartialRawMessage, RawMessage } from '../types/RawMessage';
 import { MessageUtils } from '../utils';
-import { SnodeNamespaces } from '../apis/snode_api/namespaces';
-import { Storage } from '../../util/storage';
 
 // This is an abstraction for storing pending messages.
 // Ideally we want to store pending messages in the database so that
@@ -75,7 +75,7 @@ export class PendingMessageCache {
 
     // Return if message doesn't exist in cache
     if (!this.find(message)) {
-      return;
+      return undefined;
     }
 
     // Remove item from cache and sync with database
diff --git a/ts/session/tslint.json b/ts/session/tslint.json
deleted file mode 100644
index 6d990c28de..0000000000
--- a/ts/session/tslint.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "extends": ["../../tslint.json"],
-  "rules": {
-    "no-unused-variable": false,
-    "use-simple-attributes": false
-  }
-}
diff --git a/ts/session/types/PubKey.ts b/ts/session/types/PubKey.ts
index 987250d1c2..2320bf6463 100644
--- a/ts/session/types/PubKey.ts
+++ b/ts/session/types/PubKey.ts
@@ -33,7 +33,7 @@ export class PubKey {
   // This is a temporary fix to allow groupPubkeys created from mobile to be handled correctly
   // They have a different regex to match
   // FIXME move this to a new class which validates group ids and use it in all places where we have group ids (message sending included)
-  // tslint:disable: member-ordering
+
   public static readonly regexForPubkeys = `(([0-1]5)?${PubKey.HEX}{${this.PUBKEY_LEN_NO_PREFIX}})`;
   public static readonly PREFIX_GROUP_TEXTSECURE = '__textsecure_group__!';
   // prettier-ignore
@@ -183,9 +183,8 @@ export class PubKey {
   public static getPrefix(key: string): KeyPrefixType | null {
     if (this.isValidPrefixAndLength(key)) {
       return key.substring(0, 2) as KeyPrefixType;
-    } else {
-      return null;
     }
+    return null;
   }
 
   /**
diff --git a/ts/session/utils/Attachments.ts b/ts/session/utils/Attachments.ts
index 922dc2c01a..c2fb6ce08e 100644
--- a/ts/session/utils/Attachments.ts
+++ b/ts/session/utils/Attachments.ts
@@ -1,4 +1,6 @@
 import * as crypto from 'crypto';
+import _ from 'lodash';
+
 import { Attachment } from '../../types/Attachment';
 
 import {
@@ -9,7 +11,6 @@ import {
   QuotedAttachmentWithUrl,
 } from '../messages/outgoing/visibleMessage/VisibleMessage';
 import { addAttachmentPadding } from '../crypto/BufferPadding';
-import _ from 'lodash';
 import { encryptAttachment } from '../../util/crypto/attachmentsEncrypter';
 import { uploadFileToFsWithOnionV4 } from '../apis/file_server_api/FileServerApi';
 
diff --git a/ts/session/utils/AttachmentsDownload.ts b/ts/session/utils/AttachmentsDownload.ts
index 9838cedb35..8bc14d72d8 100644
--- a/ts/session/utils/AttachmentsDownload.ts
+++ b/ts/session/utils/AttachmentsDownload.ts
@@ -1,9 +1,9 @@
 import { filter, isNumber, omit } from 'lodash';
-// tslint:disable-next-line: no-submodule-imports
+
 import { v4 as uuidv4 } from 'uuid';
 
 import * as Constants from '../constants';
-import { Data } from '../../../ts/data/data';
+import { Data } from '../../data/data';
 import { MessageModel } from '../../models/message';
 import { downloadAttachment, downloadAttachmentSogsV3 } from '../../receiver/attachments';
 import { initializeAttachmentLogic, processNewAttachment } from '../../types/MessageAttachment';
@@ -15,7 +15,6 @@ import { AttachmentDownloadMessageDetails } from '../../types/sqlSharedTypes';
 const MAX_ATTACHMENT_JOB_PARALLELISM = 3;
 
 const TICK_INTERVAL = Constants.DURATION.MINUTES;
-// tslint:disable: function-name
 
 const RETRY_BACKOFF = {
   1: Constants.DURATION.SECONDS * 30,
@@ -91,6 +90,7 @@ export async function addJob(attachment: any, job: AttachmentDownloadMessageDeta
 
 async function _tick() {
   await _maybeStartJob();
+  // eslint-disable-next-line @typescript-eslint/no-misused-promises
   timeout = setTimeout(_tick, TICK_INTERVAL);
 }
 
@@ -131,14 +131,12 @@ async function _maybeStartJob() {
     Math.min(needed, nextJobsWithoutCurrentlyRunning.length)
   );
 
-  // tslint:disable: one-variable-per-declaration
   for (let i = 0, max = jobs.length; i < max; i += 1) {
     const job = jobs[i];
     _activeAttachmentDownloadJobs[job.id] = _runJob(job);
   }
 }
 
-// tslint:disable-next-line: cyclomatic-complexity
 async function _runJob(job: any) {
   const { id, messageId, attachment, type, index, attempts, isOpenGroupV2, openGroupV2Details } =
     job || {};
@@ -230,7 +228,6 @@ async function _runJob(job: any) {
 
     await _finishJob(found, id);
   } catch (error) {
-    // tslint:disable: restrict-plus-operands
     const currentAttempt: 1 | 2 | 3 = (attempts || 0) + 1;
 
     // if we get a 404 error for attachment downloaded, we can safely assume that the attachment expired server-side.
@@ -268,7 +265,7 @@ async function _runJob(job: any) {
     };
 
     await Data.saveAttachmentDownloadJob(failedJob);
-    // tslint:disable-next-line: no-dynamic-delete
+
     delete _activeAttachmentDownloadJobs[id];
     void _maybeStartJob();
   }
@@ -283,7 +280,7 @@ async function _finishJob(message: MessageModel | null, id: string) {
   }
 
   await Data.removeAttachmentDownloadJob(id);
-  // tslint:disable-next-line: no-dynamic-delete
+
   delete _activeAttachmentDownloadJobs[id];
   await _maybeStartJob();
 }
@@ -300,7 +297,6 @@ function _markAttachmentAsError(attachment: any) {
   };
 }
 
-// tslint:disable-next-line: cyclomatic-complexity
 function _addAttachmentToMessage(
   message: MessageModel | null | undefined,
   attachment: any,
@@ -332,6 +328,7 @@ function _addAttachmentToMessage(
         throw new Error("_addAttachmentToMessage: quote didn't exist");
       }
 
+      // eslint-disable-next-line no-param-reassign
       delete message.attributes.quote.attachments;
 
       return;
@@ -341,6 +338,7 @@ function _addAttachmentToMessage(
       throw new Error(`_addAttachmentToMessage: preview didn't exist or ${index} was too large`);
     }
 
+    // eslint-disable-next-line no-param-reassign
     delete message.attributes.preview[0].image;
     return;
   }
diff --git a/ts/session/utils/AttachmentsV2.ts b/ts/session/utils/AttachmentsV2.ts
index 22a08da688..f8d53fb882 100644
--- a/ts/session/utils/AttachmentsV2.ts
+++ b/ts/session/utils/AttachmentsV2.ts
@@ -1,6 +1,9 @@
+import { isFinite } from 'lodash';
 import { Attachment } from '../../types/Attachment';
 
 import { OpenGroupRequestCommonType } from '../apis/open_group_api/opengroupV2/ApiUtil';
+import { uploadFileToRoomSogs3 } from '../apis/open_group_api/sogsv3/sogsV3SendFile';
+import { addAttachmentPadding } from '../crypto/BufferPadding';
 import {
   AttachmentPointer,
   AttachmentPointerWithUrl,
@@ -8,10 +11,7 @@ import {
   Quote,
   QuotedAttachment,
 } from '../messages/outgoing/visibleMessage/VisibleMessage';
-import { addAttachmentPadding } from '../crypto/BufferPadding';
 import { RawPreview, RawQuote } from './Attachments';
-import _ from 'lodash';
-import { uploadFileToRoomSogs3 } from '../apis/open_group_api/sogsv3/sogsV3SendFile';
 
 interface UploadParamsV2 {
   attachment: Attachment;
diff --git a/ts/session/utils/JobQueue.ts b/ts/session/utils/JobQueue.ts
index e466a1a06e..21a029e0ef 100644
--- a/ts/session/utils/JobQueue.ts
+++ b/ts/session/utils/JobQueue.ts
@@ -21,8 +21,8 @@ export class JobQueue {
       return this.jobs.get(id) as Promise<Result>;
     }
 
-    // tslint:disable-next-line: no-promise-as-boolean
     const previous = this.pending || Promise.resolve();
+    // eslint-disable-next-line more/no-then
     this.pending = previous.then(job, job);
 
     const current = this.pending;
diff --git a/ts/session/utils/Messages.ts b/ts/session/utils/Messages.ts
index fe94a9b05b..36384d2600 100644
--- a/ts/session/utils/Messages.ts
+++ b/ts/session/utils/Messages.ts
@@ -29,9 +29,8 @@ function getEncryptionTypeFromMessageType(
     isGroup
   ) {
     return SignalService.Envelope.Type.CLOSED_GROUP_MESSAGE;
-  } else {
-    return SignalService.Envelope.Type.SESSION_MESSAGE;
   }
+  return SignalService.Envelope.Type.SESSION_MESSAGE;
 }
 
 export async function toRawMessage(
@@ -45,7 +44,6 @@ export async function toRawMessage(
 
   const encryption = getEncryptionTypeFromMessageType(message, isGroup);
 
-  // tslint:disable-next-line: no-unnecessary-local-variable
   const rawMessage: RawMessage = {
     identifier: message.identifier,
     plainTextBuffer,
diff --git a/ts/session/utils/Performance.ts b/ts/session/utils/Performance.ts
index 001a566873..3576f0e4be 100644
--- a/ts/session/utils/Performance.ts
+++ b/ts/session/utils/Performance.ts
@@ -1,12 +1,10 @@
 export function perfStart(prefix: string) {
-  // tslint:disable-next-line: no-typeof-undefined
   if (typeof performance !== 'undefined') {
     performance?.mark?.(`${prefix}-start`);
   }
 }
 
 export function perfEnd(prefix: string, measureName: string) {
-  // tslint:disable-next-line: no-typeof-undefined
   if (typeof performance !== 'undefined') {
     performance?.mark?.(`${prefix}-end`);
     performance?.measure?.(measureName, `${prefix}-start`, `${prefix}-end`);
diff --git a/ts/session/utils/Promise.ts b/ts/session/utils/Promise.ts
index e9aeb0ea18..087568e2bf 100644
--- a/ts/session/utils/Promise.ts
+++ b/ts/session/utils/Promise.ts
@@ -1,4 +1,8 @@
+/* eslint-disable no-promise-executor-return */
+/* eslint-disable no-async-promise-executor */
+/* eslint-disable @typescript-eslint/no-misused-promises */
 import { Snode } from '../../data/data';
+
 type SimpleFunction<T> = (arg: T) => void;
 type Return<T> = Promise<T> | T;
 
@@ -31,7 +35,7 @@ export async function allowOnlyOneAtATime<T>(
       if (timeoutMs) {
         timeoutTimer = setTimeout(() => {
           window?.log?.warn(`allowOnlyOneAtATime - TIMEDOUT after ${timeoutMs}ms`);
-          // tslint:disable-next-line: no-dynamic-delete
+
           delete oneAtaTimeRecord[name]; // clear lock
           reject();
         }, timeoutMs);
@@ -54,7 +58,7 @@ export async function allowOnlyOneAtATime<T>(
             timeoutTimer = null;
           }
         }
-        // tslint:disable-next-line: no-dynamic-delete
+
         delete oneAtaTimeRecord[name]; // clear lock
         reject(e);
       }
@@ -65,7 +69,7 @@ export async function allowOnlyOneAtATime<T>(
           timeoutTimer = null;
         }
       }
-      // tslint:disable-next-line: no-dynamic-delete
+
       delete oneAtaTimeRecord[name]; // clear lock
       // release the kraken
       resolve(innerRetVal);
@@ -199,7 +203,7 @@ export async function timeout<T>(promise: Promise<T>, timeoutMs: number): Promis
   return Promise.race([timeoutPromise, promise]);
 }
 
-export async function delay(timeoutMs: number = 2000): Promise<Boolean> {
+export async function delay(timeoutMs: number = 2000): Promise<boolean> {
   return new Promise(resolve => {
     setTimeout(() => {
       resolve(true);
@@ -207,10 +211,9 @@ export async function delay(timeoutMs: number = 2000): Promise<Boolean> {
   });
 }
 
-// tslint:disable: no-string-based-set-timeout
 export const sleepFor = async (ms: number, showLog = false) => {
   if (showLog) {
-    // tslint:disable-next-line: no-console
+    // eslint-disable-next-line no-console
     console.info(`sleeping for ${ms}ms...`);
   }
   return new Promise(resolve => {
@@ -226,7 +229,8 @@ export const firstTrue = async (ps: Array<Promise<any>>) => {
     async p =>
       new Promise(
         // eslint-disable more/no-then
-        // tslint:disable: no-void-expression
+
+        // eslint-disable-next-line more/no-then
         (resolve, reject) => p.then(v => v && resolve(v), reject)
       )
   );
diff --git a/ts/session/utils/TaskWithTimeout.ts b/ts/session/utils/TaskWithTimeout.ts
index 28e1747c7f..c9f0ef5917 100644
--- a/ts/session/utils/TaskWithTimeout.ts
+++ b/ts/session/utils/TaskWithTimeout.ts
@@ -1,3 +1,7 @@
+/* eslint-disable no-useless-return */
+/* eslint-disable consistent-return */
+/* eslint-disable no-promise-executor-return */
+
 export const createTaskWithTimeout = (task: any, id: string, givenTimeout?: number) => {
   const timeout = givenTimeout || 1000 * 60 * 3; // three minutes
 
@@ -16,7 +20,7 @@ export const createTaskWithTimeout = (task: any, id: string, givenTimeout?: numb
           return;
         }
 
-        return null;
+        return;
       }, timeout);
       const clearTimer = () => {
         try {
@@ -61,6 +65,7 @@ export const createTaskWithTimeout = (task: any, id: string, givenTimeout?: numb
         return;
       }
 
+      // eslint-disable-next-line more/no-then
       return promise.then(success, failure);
     });
 };
diff --git a/ts/session/utils/User.ts b/ts/session/utils/User.ts
index 2d65400837..0bcae2c785 100644
--- a/ts/session/utils/User.ts
+++ b/ts/session/utils/User.ts
@@ -1,6 +1,6 @@
 import _ from 'lodash';
 import { UserUtils } from '.';
-import { Data } from '../../../ts/data/data';
+import { Data } from '../../data/data';
 import { PubKey } from '../types';
 import { fromHexToArray, toHex } from './String';
 import { getConversationController } from '../conversations';
diff --git a/ts/session/utils/calling/CallManager.ts b/ts/session/utils/calling/CallManager.ts
index 092e72d0ef..171661c859 100644
--- a/ts/session/utils/calling/CallManager.ts
+++ b/ts/session/utils/calling/CallManager.ts
@@ -1,5 +1,9 @@
+/* eslint-disable no-restricted-syntax */
+/* eslint-disable no-param-reassign */
 import _ from 'lodash';
-import { MessageUtils, ToastUtils, UserUtils } from '../';
+import { v4 as uuidv4 } from 'uuid';
+
+import { MessageUtils, ToastUtils, UserUtils } from '..';
 import { SignalService } from '../../../protobuf';
 import { openConversationWithMessages } from '../../../state/ducks/conversations';
 import {
@@ -17,7 +21,6 @@ import { CallMessage } from '../../messages/outgoing/controlMessage/CallMessage'
 import { ed25519Str } from '../../onions/onionPath';
 import { PubKey } from '../../types';
 
-import { v4 as uuidv4 } from 'uuid';
 import { getIsRinging } from '../RingingManager';
 import { getBlackSilenceMediaStream } from './Silence';
 import { getMessageQueue } from '../..';
@@ -31,8 +34,6 @@ import { GetNetworkTime } from '../../apis/snode_api/getNetworkTime';
 import { SnodeNamespaces } from '../../apis/snode_api/namespaces';
 import { READ_MESSAGE_STATE } from '../../../models/conversationAttributes';
 
-// tslint:disable: function-name
-
 export type InputItem = { deviceId: string; label: string };
 
 export const callTimeoutMs = 60000;
@@ -187,8 +188,9 @@ async function getConnectedDevices(type: 'videoinput' | 'audioinput' | 'audioout
 }
 
 // Listen for changes to media devices and update the list accordingly
-// tslint:disable-next-line: no-typeof-undefined
+
 if (typeof navigator !== 'undefined') {
+  // eslint-disable-next-line @typescript-eslint/no-misused-promises
   navigator?.mediaDevices?.addEventListener('devicechange', async () => {
     await updateConnectedDevices();
     callVideoListeners();
@@ -319,7 +321,7 @@ export async function selectAudioInputByDeviceId(audioInputDeviceId: string) {
       sender.track.enabled = false;
     }
     const silence = getBlackSilenceMediaStream().getAudioTracks()[0];
-    sender?.replaceTrack(silence);
+    void sender?.replaceTrack(silence);
     // do the same changes locally
     localStream?.getAudioTracks().forEach(t => {
       t.stop();
@@ -404,6 +406,7 @@ async function createOfferAndSendIt(recipient: string) {
       lines[lineWithFtmpIndex] = `${partBeforeComma[0]};cbr=1`;
       let overridenSdps = lines.join('\n');
       overridenSdps = overridenSdps.replace(
+        // eslint-disable-next-line prefer-regex-literals
         new RegExp('.+urn:ietf:params:rtp-hdrext:ssrc-audio-level.*\\r?\\n'),
         ''
       );
@@ -449,14 +452,14 @@ async function openMediaDevicesAndAddTracks() {
       return;
     }
 
-    selectedAudioInputId = DEVICE_DISABLED_DEVICE_ID; //audioInputsList[0].deviceId;
+    selectedAudioInputId = DEVICE_DISABLED_DEVICE_ID; // audioInputsList[0].deviceId;
     selectedCameraId = DEVICE_DISABLED_DEVICE_ID;
     window.log.info(
       `openMediaDevices videoDevice:${selectedCameraId} audioDevice:${selectedAudioInputId}`
     );
 
     localStream = getBlackSilenceMediaStream();
-    localStream.getTracks().map(track => {
+    localStream.getTracks().forEach(track => {
       if (localStream) {
         peerConnection?.addTrack(track, localStream);
       }
@@ -530,6 +533,7 @@ export async function USER_callRecipient(recipient: string) {
   await createOfferAndSendIt(recipient);
 
   // close and end the call if callTimeoutMs is reached and still not connected
+  // eslint-disable-next-line @typescript-eslint/no-misused-promises
   global.setTimeout(async () => {
     if (justCreatedCallUUID === currentCallUUID && getIsRinging()) {
       window.log.info(
@@ -541,7 +545,7 @@ export async function USER_callRecipient(recipient: string) {
   }, callTimeoutMs);
 }
 
-const iceCandidates: Array<RTCIceCandidate> = new Array();
+const iceCandidates: Array<RTCIceCandidate> = [];
 const iceSenderDebouncer = _.debounce(async (recipient: string) => {
   if (!iceCandidates) {
     return;
@@ -710,7 +714,7 @@ function onDataChannelReceivedMessage(ev: MessageEvent<string>) {
     }
 
     if (parsed.video !== undefined) {
-      remoteVideoStreamIsMuted = !Boolean(parsed.video);
+      remoteVideoStreamIsMuted = !parsed.video;
     }
   } catch (e) {
     window.log.warn('onDataChannelReceivedMessage Could not parse data in event', ev);
@@ -763,7 +767,8 @@ function createOrGetPeerConnection(withPubkey: string) {
     );
 
     if (peerConnection && peerConnection?.iceConnectionState === 'disconnected') {
-      //this will trigger a negotiation event with iceRestart set to true in the createOffer options set
+      // this will trigger a negotiation event with iceRestart set to true in the createOffer options set
+      // eslint-disable-next-line @typescript-eslint/no-misused-promises
       global.setTimeout(async () => {
         window.log.info('onconnectionstatechange disconnected: restartIce()');
 
@@ -847,6 +852,7 @@ export async function USER_acceptIncomingCallRequest(fromSender: string) {
       const sdpMLineIndex = lastCandidatesFromSender.sdpMLineIndexes[index];
       const sdpMid = lastCandidatesFromSender.sdpMids[index];
       const candicate = new RTCIceCandidate({ sdpMid, sdpMLineIndex, candidate: sdp });
+      // eslint-disable-next-line no-await-in-loop
       await peerConnection.addIceCandidate(candicate);
     }
   }
@@ -936,19 +942,18 @@ export async function USER_hangup(fromSender: string) {
   if (!currentCallUUID) {
     window.log.warn('should not be able to hangup without a currentCallUUID');
     return;
-  } else {
-    rejectedCallUUIDS.add(currentCallUUID);
-    const endCallMessage = new CallMessage({
-      type: SignalService.CallMessage.Type.END_CALL,
-      timestamp: Date.now(),
-      uuid: currentCallUUID,
-    });
-    void getMessageQueue().sendToPubKeyNonDurably({
-      pubkey: PubKey.cast(fromSender),
-      message: endCallMessage,
-      namespace: SnodeNamespaces.UserMessages,
-    });
   }
+  rejectedCallUUIDS.add(currentCallUUID);
+  const endCallMessage = new CallMessage({
+    type: SignalService.CallMessage.Type.END_CALL,
+    timestamp: Date.now(),
+    uuid: currentCallUUID,
+  });
+  void getMessageQueue().sendToPubKeyNonDurably({
+    pubkey: PubKey.cast(fromSender),
+    message: endCallMessage,
+    namespace: SnodeNamespaces.UserMessages,
+  });
 
   window.inboxStore?.dispatch(endCall());
   window.log.info('sending hangup with an END_CALL MESSAGE');
@@ -1177,13 +1182,12 @@ export async function handleMissedCall(
       ToastUtils.pushedMissedCallNotApproved(displayname);
       break;
     case 'too-old-timestamp':
-      //no toast for this case, the missed call notification is enough
+      // no toast for this case, the missed call notification is enough
       break;
     default:
   }
 
   await addMissedCallMessage(sender, incomingOfferTimestamp);
-  return;
 }
 
 async function addMissedCallMessage(callerPubkey: string, sentAt: number) {
@@ -1266,9 +1270,9 @@ export async function handleCallTypeAnswer(
       }
     }
     return;
-  } else {
-    window.log.info(`handling callMessage ANSWER from ${callMessageUUID}`);
   }
+  window.log.info(`handling callMessage ANSWER from ${callMessageUUID}`);
+
   const cachedMessage = getCachedMessageFromCallMessage(callMessage, envelopeTimestamp);
 
   pushCallMessageToCallCache(sender, callMessageUUID, cachedMessage);
@@ -1324,13 +1328,13 @@ export async function handleCallTypeIceCandidates(
 
 async function addIceCandidateToExistingPeerConnection(callMessage: SignalService.CallMessage) {
   if (peerConnection) {
-    // tslint:disable-next-line: prefer-for-of
     for (let index = 0; index < callMessage.sdps.length; index++) {
       const sdp = callMessage.sdps[index];
       const sdpMLineIndex = callMessage.sdpMLineIndexes[index];
       const sdpMid = callMessage.sdpMids[index];
       const candicate = new RTCIceCandidate({ sdpMid, sdpMLineIndex, candidate: sdp });
       try {
+        // eslint-disable-next-line no-await-in-loop
         await peerConnection.addIceCandidate(candicate);
       } catch (err) {
         if (!ignoreOffer) {
@@ -1343,7 +1347,6 @@ async function addIceCandidateToExistingPeerConnection(callMessage: SignalServic
   }
 }
 
-// tslint:disable-next-line: no-async-without-await
 export async function handleOtherCallTypes(
   sender: string,
   callMessage: SignalService.CallMessage,
@@ -1368,7 +1371,7 @@ function createCallCacheForPubkeyAndUUID(sender: string, uuid: string) {
   }
 
   if (!callCache.get(sender)?.has(uuid)) {
-    callCache.get(sender)?.set(uuid, new Array());
+    callCache.get(sender)?.set(uuid, []);
   }
 }
 
diff --git a/ts/session/utils/job_runners/JobRunner.ts b/ts/session/utils/job_runners/JobRunner.ts
index ce5fb6bfcb..abb1c71b3d 100644
--- a/ts/session/utils/job_runners/JobRunner.ts
+++ b/ts/session/utils/job_runners/JobRunner.ts
@@ -204,9 +204,8 @@ export class PersistedJobRunner<T extends TypeOfPersistedData> {
     if (!this.isStarted) {
       if (this.jobsScheduled.length) {
         return 'job_deferred';
-      } else {
-        return 'no_job';
       }
+      return 'no_job';
     }
 
     if (this.currentJob) {
@@ -322,7 +321,7 @@ export class PersistedJobRunner<T extends TypeOfPersistedData> {
             nextJob.persistedData.delayBetweenRetries
           }...`
         );
-        nextJob.persistedData.currentRetry = nextJob.persistedData.currentRetry + 1;
+        nextJob.persistedData.currentRetry += 1;
         // that job can be restarted. Plan a retry later with the already defined retry
         nextJob.persistedData.nextAttemptTimestamp =
           Date.now() + nextJob.persistedData.delayBetweenRetries;
diff --git a/ts/session/utils/job_runners/PersistedJob.ts b/ts/session/utils/job_runners/PersistedJob.ts
index b266760d93..85e52b7a35 100644
--- a/ts/session/utils/job_runners/PersistedJob.ts
+++ b/ts/session/utils/job_runners/PersistedJob.ts
@@ -100,7 +100,6 @@ export abstract class PersistedJob<T extends PersistedJobData> {
    */
   public async waitForCurrentTry() {
     try {
-      // tslint:disable-next-line: no-promise-as-boolean
       return this.runningPromise || Promise.resolve(true);
     } catch (e) {
       window.log.warn('waitForCurrentTry got an error: ', e.message);
diff --git a/ts/session/utils/job_runners/jobs/AvatarDownloadJob.ts b/ts/session/utils/job_runners/jobs/AvatarDownloadJob.ts
index fb6c5af6d9..273ab43462 100644
--- a/ts/session/utils/job_runners/jobs/AvatarDownloadJob.ts
+++ b/ts/session/utils/job_runners/jobs/AvatarDownloadJob.ts
@@ -92,7 +92,6 @@ class AvatarDownloadJob extends PersistedJob<AvatarDownloadPersistedData> {
     });
   }
 
-  // tslint:disable-next-line: cyclomatic-complexity
   public async run(): Promise<RunJobResult> {
     const convoId = this.persistedData.conversationId;
 
@@ -185,14 +184,12 @@ class AvatarDownloadJob extends PersistedJob<AvatarDownloadPersistedData> {
         );
         return RunJobResult.RetryJobIfPossible;
       }
-    } else {
+    } else if (conversation.get('avatarInProfile')) {
       // there is no valid avatar to download, make sure the local file of the avatar of that user is removed
-      if (conversation.get('avatarInProfile')) {
-        conversation.set({
-          avatarInProfile: undefined,
-        });
-        changes = true;
-      }
+      conversation.set({
+        avatarInProfile: undefined,
+      });
+      changes = true;
     }
 
     if (conversation.id === UserUtils.getOurPubKeyStrFromCache()) {
diff --git a/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts b/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts
index 5fc60cbf96..aaae284d15 100644
--- a/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts
+++ b/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts
@@ -1,3 +1,4 @@
+/* eslint-disable no-await-in-loop */
 import { compact, isArray, isEmpty, isNumber, isString } from 'lodash';
 import { v4 } from 'uuid';
 import { UserUtils } from '../..';
@@ -71,32 +72,28 @@ function resultsToSuccessfulChange(
    * So we need to check which request failed, and if it is the delete by hashes, we need to add the hash of the posted message to the list of hashes
    */
 
-  try {
-    if (!result?.length) {
-      return successfulChanges;
-    }
+  if (!result?.length) {
+    return successfulChanges;
+  }
 
-    for (let j = 0; j < result.length; j++) {
-      const batchResult = result[j];
-      const messagePostedHashes = batchResult?.body?.hash;
-
-      if (
-        batchResult.code === 200 &&
-        isString(messagePostedHashes) &&
-        request.messages?.[j].message
-      ) {
-        // the library keeps track of the hashes to push and pushed using the hashes now
-        successfulChanges.push({
-          updatedHash: messagePostedHashes,
-          message: request.messages?.[j].message,
-        });
-      }
+  for (let j = 0; j < result.length; j++) {
+    const batchResult = result[j];
+    const messagePostedHashes = batchResult?.body?.hash;
+
+    if (
+      batchResult.code === 200 &&
+      isString(messagePostedHashes) &&
+      request.messages?.[j].message
+    ) {
+      // the library keeps track of the hashes to push and pushed using the hashes now
+      successfulChanges.push({
+        updatedHash: messagePostedHashes,
+        message: request.messages?.[j].message,
+      });
     }
-
-    return successfulChanges;
-  } catch (e) {
-    throw e;
   }
+
+  return successfulChanges;
 }
 
 async function buildAndSaveDumpsToDB(
@@ -238,6 +235,7 @@ class ConfigurationSyncJob extends PersistedJob<ConfigurationSyncPersistedData>
       await buildAndSaveDumpsToDB(changes, thisJobDestination);
       this.triggerConfSyncJobDone();
       return RunJobResult.Success;
+      // eslint-disable-next-line no-useless-catch
     } catch (e) {
       throw e;
     } finally {
diff --git a/ts/session/utils/libsession/libsession_utils.ts b/ts/session/utils/libsession/libsession_utils.ts
index 153a46e72f..5ad67302ab 100644
--- a/ts/session/utils/libsession/libsession_utils.ts
+++ b/ts/session/utils/libsession/libsession_utils.ts
@@ -1,3 +1,6 @@
+/* eslint-disable no-await-in-loop */
+/* eslint-disable import/extensions */
+/* eslint-disable import/no-unresolved */
 import { difference, omit } from 'lodash';
 import Long from 'long';
 import { UserUtils } from '..';
@@ -144,6 +147,7 @@ async function pendingChangesForPubkey(pubkey: string): Promise<Array<OutgoingCo
   return results;
 }
 
+// eslint-disable-next-line consistent-return
 function kindToVariant(kind: SignalService.SharedConfigMessage.Kind): ConfigWrapperObjectTypes {
   switch (kind) {
     case SignalService.SharedConfigMessage.Kind.USER_PROFILE:
@@ -159,6 +163,7 @@ function kindToVariant(kind: SignalService.SharedConfigMessage.Kind): ConfigWrap
   }
 }
 
+// eslint-disable-next-line consistent-return
 function variantToKind(variant: ConfigWrapperObjectTypes): SignalService.SharedConfigMessage.Kind {
   switch (variant) {
     case 'UserConfig':
diff --git a/ts/session/utils/libsession/libsession_utils_contacts.ts b/ts/session/utils/libsession/libsession_utils_contacts.ts
index 00186a241d..01d95a471c 100644
--- a/ts/session/utils/libsession/libsession_utils_contacts.ts
+++ b/ts/session/utils/libsession/libsession_utils_contacts.ts
@@ -36,7 +36,7 @@ function isContactToStoreInWrapper(convo: ConversationModel): boolean {
  * Fetches the specified convo and updates the required field in the wrapper.
  * If that contact does not exist in the wrapper, it is created before being updated.
  */
-// tslint:disable-next-line: cyclomatic-complexity
+
 async function insertContactFromDBIntoWrapperAndRefresh(id: string): Promise<void> {
   const foundConvo = getConversationController().get(id);
   if (!foundConvo) {
@@ -95,13 +95,11 @@ async function refreshMappedValue(id: string, duringAppStart = false) {
         .get(id)
         ?.triggerUIRefresh();
     }
-  } else {
-    if (mappedContactWrapperValues.delete(id)) {
-      if (!duringAppStart) {
-        getConversationController()
-          .get(id)
-          ?.triggerUIRefresh();
-      }
+  } else if (mappedContactWrapperValues.delete(id)) {
+    if (!duringAppStart) {
+      getConversationController()
+        .get(id)
+        ?.triggerUIRefresh();
     }
   }
 }
diff --git a/ts/session/utils/libsession/libsession_utils_convo_info_volatile.ts b/ts/session/utils/libsession/libsession_utils_convo_info_volatile.ts
index abcf92dcc7..dbde501507 100644
--- a/ts/session/utils/libsession/libsession_utils_convo_info_volatile.ts
+++ b/ts/session/utils/libsession/libsession_utils_convo_info_volatile.ts
@@ -1,5 +1,6 @@
+/* eslint-disable no-case-declarations */
 import { BaseConvoInfoVolatile, ConvoVolatileType } from 'libsession_util_nodejs';
-import { isEmpty } from 'lodash';
+import { isEmpty, isFinite } from 'lodash';
 import { Data } from '../../../data/data';
 import { OpenGroupData } from '../../../data/opengroups';
 import { ConversationModel } from '../../../models/conversation';
@@ -259,7 +260,9 @@ async function removeContactFromWrapper(convoId: string) {
  * You can do a loop on all the types handled by this wrapper and have a switch using assertUnreachable to get errors when not every case is handled.
  *
  *
- * Note: Ideally, we'd like to have this type in the wrapper index.d.ts, but it would require it to be a index.ts instead, which causes a whole other bunch of issues because it is a native node module.
+ * Note: Ideally, we'd like to have this type in the wrapper index.d.ts,
+ * but it would require it to be a index.ts instead, which causes a
+ * whole other bunch of issues because it is a native node module.
  */
 function getConvoInfoVolatileTypes(): Array<ConvoVolatileType> {
   return ['1o1', 'LegacyGroup', 'Community'];
diff --git a/ts/session/utils/libsession/libsession_utils_user_groups.ts b/ts/session/utils/libsession/libsession_utils_user_groups.ts
index 0a129c637e..0186f5568b 100644
--- a/ts/session/utils/libsession/libsession_utils_user_groups.ts
+++ b/ts/session/utils/libsession/libsession_utils_user_groups.ts
@@ -1,3 +1,4 @@
+/* eslint-disable no-case-declarations */
 import { CommunityInfo, UserGroupsType } from 'libsession_util_nodejs';
 import { Data } from '../../../data/data';
 import { OpenGroupData } from '../../../data/opengroups';
@@ -33,7 +34,9 @@ function isLegacyGroupToStoreInWrapper(convo: ConversationModel): boolean {
 }
 
 /**
- * We do not want to include groups left in the wrapper, but when receiving a list of wrappers from the network we need to check against the one present locally but already left, to know we need to remove them.
+ * We do not want to include groups left in the wrapper, but when receiving a list
+ * of wrappers from the network we need to check against the one present locally
+ * but already left, to know we need to remove them.
  *
  * This is to take care of this case:
  * - deviceA creates group
@@ -181,7 +184,9 @@ async function removeLegacyGroupFromWrapper(groupPk: string) {
  * You can do a loop on all the types handled by this wrapper and have a switch using assertUnreachable to get errors when not every case is handled.
  *
  *
- * Note: Ideally, we'd like to have this type in the wrapper index.d.ts, but it would require it to be a index.ts instead, which causes a whole other bunch of issues because it is a native node module.
+ * Note: Ideally, we'd like to have this type in the wrapper index.d.ts,
+ * but it would require it to be a index.ts instead, which causes a
+ * whole other bunch of issues because it is a native node module.
  */
 function getUserGroupTypes(): Array<UserGroupsType> {
   return ['Community', 'LegacyGroup'];
diff --git a/ts/session/utils/sync/syncUtils.ts b/ts/session/utils/sync/syncUtils.ts
index e1d3ace6c5..8baff4f1d9 100644
--- a/ts/session/utils/sync/syncUtils.ts
+++ b/ts/session/utils/sync/syncUtils.ts
@@ -96,21 +96,20 @@ export const forceSyncConfigurationNowIfNeeded = async (waitForMessageSent = fal
       if (waitForMessageSent) {
         window.Whisper.events.once(ConfigurationSyncJobDone, () => {
           resolve(true);
-          return;
         });
         return;
-      } else {
-        resolve(true);
-        return;
       }
+      resolve(true);
+      return;
     }
     const allConvos = getConversationController().getConversations();
 
+    // eslint-disable-next-line more/no-then
     void getCurrentConfigurationMessage(allConvos)
       .then(configMessage => {
         // this just adds the message to the sending queue.
         // if waitForMessageSent is set, we need to effectively wait until then
-        // tslint:disable-next-line: no-void-expression
+
         const callback = waitForMessageSent
           ? () => {
               resolve(true);
diff --git a/ts/shims/events.ts b/ts/shims/events.ts
index b5e93d8768..2ab75b3c85 100644
--- a/ts/shims/events.ts
+++ b/ts/shims/events.ts
@@ -1,5 +1,4 @@
 export function trigger(name: string, param1?: any, param2?: any) {
-  // @ts-ignore
   window.Whisper.events.trigger(name, param1, param2);
 }
 
diff --git a/ts/state/actions.ts b/ts/state/actions.ts
index d3eab8b634..526a1de7c3 100644
--- a/ts/state/actions.ts
+++ b/ts/state/actions.ts
@@ -8,7 +8,7 @@ import { actions as theme } from './ducks/theme';
 import { actions as modalDialog } from './ducks/modalDialog';
 import { actions as primaryColor } from './ducks/primaryColor';
 
-export function mapDispatchToProps(dispatch: Dispatch): Object {
+export function mapDispatchToProps(dispatch: Dispatch): object {
   return {
     ...bindActionCreators(
       {
diff --git a/ts/state/createStore.ts b/ts/state/createStore.ts
index 38760107af..96cbd64b51 100644
--- a/ts/state/createStore.ts
+++ b/ts/state/createStore.ts
@@ -1,24 +1,22 @@
+/* eslint-disable no-console */
+import storage from 'redux-persist/lib/storage';
+
 import { createLogger } from 'redux-logger';
 import { configureStore } from '@reduxjs/toolkit';
-import { rootReducer } from './reducer';
+
 import { persistReducer } from 'redux-persist';
-// tslint:disable-next-line: match-default-export-name
-import promiseMiddleware from 'redux-promise-middleware';
 
-// tslint:disable-next-line: no-submodule-imports match-default-export-name
-import storage from 'redux-persist/lib/storage';
-// @ts-ignore
-const env = window.getEnvironment();
+import promiseMiddleware from 'redux-promise-middleware';
+import { rootReducer } from './reducer';
 
 // So Redux logging doesn't go to disk, and so we can get colors/styles
 const directConsole = {
-  // @ts-ignore
-  log: console._log,
+  log: (console as any)._log,
   groupCollapsed: console.groupCollapsed,
   group: console.group,
   groupEnd: console.groupEnd,
   warn: console.warn,
-  // tslint:disable-next-line no-console
+
   error: console.error,
 };
 
@@ -35,7 +33,7 @@ export const persistConfig = {
 const persistedReducer = persistReducer(persistConfig, rootReducer);
 
 // Exclude logger if we're in production mode
-const disableLogging = true; //; env === 'production' || true; // ALWAYS TURNED OFF
+const disableLogging = true;
 const middlewareList = disableLogging ? [promiseMiddleware] : [logger, promiseMiddleware];
 
 export const createStore = (initialState: any) =>
diff --git a/ts/state/ducks/conversations.ts b/ts/state/ducks/conversations.ts
index 5108cdfd03..5e26b98c80 100644
--- a/ts/state/ducks/conversations.ts
+++ b/ts/state/ducks/conversations.ts
@@ -1,3 +1,4 @@
+/* eslint-disable no-restricted-syntax */
 import { createAsyncThunk, createSlice, PayloadAction } from '@reduxjs/toolkit';
 import { omit, toNumber } from 'lodash';
 import { ReplyingToMessageProps } from '../../components/conversation/composition/CompositionBox';
@@ -529,12 +530,12 @@ function handleMessagesChangedOrAdded(
   state: ConversationsStateType,
   payload: Array<MessageModelPropsWithoutConvoProps>
 ) {
+  let stateCopy = state;
   payload.forEach(element => {
-    // tslint:disable-next-line: no-parameter-reassignment
-    state = handleMessageChangedOrAdded(state, element);
+    stateCopy = handleMessageChangedOrAdded(stateCopy, element);
   });
 
-  return state;
+  return stateCopy;
 }
 
 function handleMessageExpiredOrDeleted(
@@ -567,7 +568,6 @@ function handleMessageExpiredOrDeleted(
           `Deleting quote {${timestamp}-${sender}} ${JSON.stringify(message2Delete)}`
         );
 
-        // tslint:disable-next-line: no-dynamic-delete
         delete editedQuotes[`${timestamp}-${sender}`];
       }
 
@@ -594,12 +594,12 @@ function handleMessagesExpiredOrDeleted(
     }>
   >
 ): ConversationsStateType {
+  let stateCopy = state;
   action.payload.forEach(element => {
-    // tslint:disable-next-line: no-parameter-reassignment
-    state = handleMessageExpiredOrDeleted(state, element);
+    stateCopy = handleMessageExpiredOrDeleted(stateCopy, element);
   });
 
-  return state;
+  return stateCopy;
 }
 
 function handleConversationReset(state: ConversationsStateType, action: PayloadAction<string>) {
diff --git a/ts/state/ducks/defaultRooms.tsx b/ts/state/ducks/defaultRooms.tsx
index 8ea290481a..ffca2b1d9b 100644
--- a/ts/state/ducks/defaultRooms.tsx
+++ b/ts/state/ducks/defaultRooms.tsx
@@ -29,7 +29,7 @@ const defaultRoomsSlice = createSlice({
     updateDefaultRooms(state, action) {
       // window?.log?.info('updating default rooms', action.payload);
       const rooms = action.payload as Array<OpenGroupV2InfoJoinable>;
-      return { ...state, rooms: rooms };
+      return { ...state, rooms };
     },
     updateDefaultRoomsInProgress(state, action) {
       const inProgress = action.payload as boolean;
diff --git a/ts/state/ducks/modalDialog.tsx b/ts/state/ducks/modalDialog.tsx
index ea8428b703..37053dcfcd 100644
--- a/ts/state/ducks/modalDialog.tsx
+++ b/ts/state/ducks/modalDialog.tsx
@@ -1,6 +1,7 @@
 import { createSlice, PayloadAction } from '@reduxjs/toolkit';
 import { SessionConfirmDialogProps } from '../../components/dialog/SessionConfirm';
 import { PasswordAction } from '../../components/dialog/SessionPasswordDialog';
+
 export type BanType = 'ban' | 'unban';
 
 export type ConfirmModalState = SessionConfirmDialogProps | null;
@@ -16,7 +17,7 @@ export type UpdateGroupMembersModalState = InviteContactModalState;
 export type UpdateGroupNameModalState = InviteContactModalState;
 export type ChangeNickNameModalState = InviteContactModalState;
 export type AdminLeaveClosedGroupModalState = InviteContactModalState;
-export type EditProfileModalState = {} | null;
+export type EditProfileModalState = object | null;
 export type OnionPathModalState = EditProfileModalState;
 export type RecoveryPhraseModalState = EditProfileModalState;
 export type DeleteAccountModalState = EditProfileModalState;
diff --git a/ts/state/ducks/search.ts b/ts/state/ducks/search.ts
index d31bcea10d..b868d6c823 100644
--- a/ts/state/ducks/search.ts
+++ b/ts/state/ducks/search.ts
@@ -1,8 +1,9 @@
-import { Data } from '../../../ts/data/data';
+/* eslint-disable no-restricted-syntax */
+import _, { isNaN } from 'lodash';
+import { Data } from '../../data/data';
 import { AdvancedSearchOptions, SearchOptions } from '../../types/Search';
 import { cleanSearchTerm } from '../../util/cleanSearchTerm';
 
-import _ from 'lodash';
 import { MessageResultProps } from '../../components/search/MessageSearchResults';
 import { ConversationTypeEnum } from '../../models/conversationAttributes';
 import { PubKey } from '../../session/types';
diff --git a/ts/state/ducks/section.tsx b/ts/state/ducks/section.tsx
index d1e1351e2f..17fe873ff9 100644
--- a/ts/state/ducks/section.tsx
+++ b/ts/state/ducks/section.tsx
@@ -117,6 +117,7 @@ export const reducer = (
   switch (type) {
     case FOCUS_SECTION:
       // if we change to something else than settings, reset the focused settings section
+      // eslint-disable-next-line no-case-declarations
       const castedPayload = (payload as unknown) as SectionType;
 
       if (castedPayload !== SectionType.Settings) {
diff --git a/ts/state/ducks/settings.tsx b/ts/state/ducks/settings.tsx
index 7f7050ff3c..b499c78d12 100644
--- a/ts/state/ducks/settings.tsx
+++ b/ts/state/ducks/settings.tsx
@@ -1,6 +1,7 @@
+import { isBoolean } from 'lodash';
+
 import { PayloadAction, createSlice } from '@reduxjs/toolkit';
 import { SettingsKey } from '../../data/settings-key';
-import { isBoolean } from 'lodash';
 import { Storage } from '../../util/storage';
 
 const SettingsBoolsKeyTrackedInRedux = [
@@ -62,7 +63,6 @@ const settingsSlice = createSlice({
         return state;
       }
 
-      // tslint:disable-next-line: no-dynamic-delete
       delete state.settingsBools[action.payload];
       return state;
     },
diff --git a/ts/state/ducks/sogsRoomInfo.tsx b/ts/state/ducks/sogsRoomInfo.tsx
index c1f915c09d..6ebe3c6ce4 100644
--- a/ts/state/ducks/sogsRoomInfo.tsx
+++ b/ts/state/ducks/sogsRoomInfo.tsx
@@ -1,5 +1,5 @@
 import { createSlice, PayloadAction } from '@reduxjs/toolkit';
-import { sortBy, uniq, xor } from 'lodash';
+import { isFinite, sortBy, uniq, xor } from 'lodash';
 import {
   getCanWriteOutsideRedux,
   getCurrentSubscriberCountOutsideRedux,
diff --git a/ts/state/ducks/stagedAttachments.ts b/ts/state/ducks/stagedAttachments.ts
index 727b3ab477..8c6787d440 100644
--- a/ts/state/ducks/stagedAttachments.ts
+++ b/ts/state/ducks/stagedAttachments.ts
@@ -60,7 +60,7 @@ const stagedAttachmentsSlice = createSlice({
           URL.revokeObjectURL(attachment.videoUrl);
         }
       });
-      // tslint:disable-next-line: no-dynamic-delete
+
       delete state.stagedAttachments[conversationKey];
       return state;
     },
diff --git a/ts/state/reducer.ts b/ts/state/reducer.ts
index b81405f706..c6db627a70 100644
--- a/ts/state/reducer.ts
+++ b/ts/state/reducer.ts
@@ -59,5 +59,4 @@ export const reducers = {
 
 // Making this work would require that our reducer signature supported AnyAction, not
 //   our restricted actions
-// @ts-ignore
 export const rootReducer = combineReducers(reducers);
diff --git a/ts/state/selectors/conversations.ts b/ts/state/selectors/conversations.ts
index 97a4f49041..21b03d926b 100644
--- a/ts/state/selectors/conversations.ts
+++ b/ts/state/selectors/conversations.ts
@@ -1,4 +1,6 @@
+/* eslint-disable no-restricted-syntax */
 import { createSelector } from '@reduxjs/toolkit';
+import { filter, isEmpty, isNumber, pick, sortBy, toNumber, isFinite } from 'lodash';
 
 import {
   ConversationLookupType,
@@ -19,7 +21,6 @@ import { ReplyingToMessageProps } from '../../components/conversation/compositio
 import { MessageAttachmentSelectorProps } from '../../components/conversation/message/message-content/MessageAttachment';
 import { MessageContentSelectorProps } from '../../components/conversation/message/message-content/MessageContent';
 import { MessageContentWithStatusSelectorProps } from '../../components/conversation/message/message-content/MessageContentWithStatus';
-import { MessageContextMenuSelectorProps } from '../../components/conversation/message/message-content/MessageContextMenu';
 import { MessageTextSelectorProps } from '../../components/conversation/message/message-content/MessageText';
 import { GenericReadableMessageSelectorProps } from '../../components/conversation/message/message-item/GenericReadableMessage';
 import { LightBoxOptions } from '../../components/conversation/SessionConversation';
@@ -32,7 +33,6 @@ import { BlockedNumberController } from '../../util';
 import { Storage } from '../../util/storage';
 import { getIntl } from './user';
 
-import { filter, isEmpty, isNumber, pick, sortBy, toNumber } from 'lodash';
 import { MessageReactsSelectorProps } from '../../components/conversation/message/message-content/MessageReactions';
 import { processQuoteAttachment } from '../../models/message';
 import { isUsAnySogsFromCache } from '../../session/apis/open_group_api/sogsv3/knownBlindedkeys';
@@ -284,7 +284,6 @@ const _getLeftPaneConversationIds = (
     .map(m => m.id);
 };
 
-// tslint:disable-next-line: cyclomatic-complexity
 const _getPrivateFriendsConversations = (
   sortedConversations: Array<ReduxConversationType>
 ): Array<ReduxConversationType> => {
@@ -300,7 +299,6 @@ const _getPrivateFriendsConversations = (
   });
 };
 
-// tslint:disable-next-line: cyclomatic-complexity
 const _getGlobalUnreadCount = (sortedConversations: Array<ReduxConversationType>): number => {
   let globalUnreadCount = 0;
   for (const conversation of sortedConversations) {
@@ -647,8 +645,6 @@ export const getSelectedConversation = createSelector(
   }
 );
 
-// tslint:disable: cyclomatic-complexity
-
 export const getMessagePropsByMessageId = createSelector(
   getSortedMessagesOfSelectedConversation,
   getSelectedConversation,
@@ -753,7 +749,6 @@ export const getMessageReactsProps = createSelector(getMessagePropsByMessageId,
   return msgProps;
 });
 
-// tslint:disable: cyclomatic-complexity
 export const getMessageQuoteProps = createSelector(
   getConversationLookup,
   getMessagesOfSelectedConversation,
@@ -835,7 +830,6 @@ export const getMessageQuoteProps = createSelector(
     };
   }
 );
-// tslint:enable: cyclomatic-complexity
 
 export const getMessageTextProps = createSelector(getMessagePropsByMessageId, (props):
   | MessageTextSelectorProps
@@ -855,33 +849,6 @@ export const getMessageTextProps = createSelector(getMessagePropsByMessageId, (p
   return msgProps;
 });
 
-/**
- * TODO probably not something which should be memoized with createSelector as we rememoize it for each message (and override the previous one). Not sure what is the right way to do a lookup. But maybe something like having the messages as a record<id, message> and do a simple lookup to grab the details.
- * And the the sorting would be done in a memoized selector
- */
-export const getMessageContextMenuProps = createSelector(getMessagePropsByMessageId, (props):
-  | MessageContextMenuSelectorProps
-  | undefined => {
-  if (!props || isEmpty(props)) {
-    return undefined;
-  }
-
-  const msgProps: MessageContextMenuSelectorProps = pick(props.propsForMessage, [
-    'attachments',
-    'sender',
-    'direction',
-    'status',
-    'isDeletable',
-    'isSenderAdmin',
-    'text',
-    'serverTimestamp',
-    'timestamp',
-    'isDeletableForEveryone',
-  ]);
-
-  return msgProps;
-});
-
 export const getMessageAttachmentProps = createSelector(getMessagePropsByMessageId, (props):
   | MessageAttachmentSelectorProps
   | undefined => {
diff --git a/ts/state/selectors/messages.ts b/ts/state/selectors/messages.ts
index 1dd0fabc48..c23e9c41fb 100644
--- a/ts/state/selectors/messages.ts
+++ b/ts/state/selectors/messages.ts
@@ -9,9 +9,9 @@ import {
 import { StateType } from '../reducer';
 import { getMessagePropsByMessageId } from './conversations';
 
-const useMessageIdProps = (messageId: string | undefined) => {
+function useMessagePropsByMessageId(messageId: string | undefined) {
   return useSelector((state: StateType) => getMessagePropsByMessageId(state, messageId));
-};
+}
 
 const useSenderConvoProps = (
   msgProps: MessageModelPropsWithConvoProps | undefined
@@ -26,7 +26,7 @@ const useSenderConvoProps = (
 };
 
 export const useAuthorProfileName = (messageId: string): string | null => {
-  const msg = useMessageIdProps(messageId);
+  const msg = useMessagePropsByMessageId(messageId);
   const senderProps = useSenderConvoProps(msg);
   if (!msg || !senderProps) {
     return null;
@@ -41,7 +41,7 @@ export const useAuthorProfileName = (messageId: string): string | null => {
 };
 
 export const useAuthorName = (messageId: string): string | null => {
-  const msg = useMessageIdProps(messageId);
+  const msg = useMessagePropsByMessageId(messageId);
   const senderProps = useSenderConvoProps(msg);
   if (!msg || !senderProps) {
     return null;
@@ -52,7 +52,7 @@ export const useAuthorName = (messageId: string): string | null => {
 };
 
 export const useAuthorAvatarPath = (messageId: string): string | null => {
-  const msg = useMessageIdProps(messageId);
+  const msg = useMessagePropsByMessageId(messageId);
   const senderProps = useSenderConvoProps(msg);
   if (!msg || !senderProps) {
     return null;
@@ -62,46 +62,66 @@ export const useAuthorAvatarPath = (messageId: string): string | null => {
 };
 
 export const useMessageIsDeleted = (messageId: string): boolean => {
-  const props = useMessageIdProps(messageId);
+  const props = useMessagePropsByMessageId(messageId);
   return props?.propsForMessage.isDeleted || false;
 };
 
 export const useFirstMessageOfSeries = (messageId: string | undefined): boolean => {
-  return useMessageIdProps(messageId)?.firstMessageOfSeries || false;
+  return useMessagePropsByMessageId(messageId)?.firstMessageOfSeries || false;
 };
 
 export const useLastMessageOfSeries = (messageId: string | undefined): boolean => {
-  return useMessageIdProps(messageId)?.lastMessageOfSeries || false;
+  return useMessagePropsByMessageId(messageId)?.lastMessageOfSeries || false;
 };
 
 export const useMessageAuthor = (messageId: string | undefined): string | undefined => {
-  return useMessageIdProps(messageId)?.propsForMessage.sender;
+  return useMessagePropsByMessageId(messageId)?.propsForMessage.sender;
 };
 
 export const useMessageDirection = (messageId: string | undefined): string | undefined => {
-  return useMessageIdProps(messageId)?.propsForMessage.direction;
+  return useMessagePropsByMessageId(messageId)?.propsForMessage.direction;
 };
 
 export const useMessageLinkPreview = (messageId: string | undefined): Array<any> | undefined => {
-  return useMessageIdProps(messageId)?.propsForMessage.previews;
+  return useMessagePropsByMessageId(messageId)?.propsForMessage.previews;
 };
 
 export const useMessageAttachments = (
   messageId: string | undefined
 ): Array<PropsForAttachment> | undefined => {
-  return useMessageIdProps(messageId)?.propsForMessage.attachments;
+  return useMessagePropsByMessageId(messageId)?.propsForMessage.attachments;
 };
 
 export const useMessageSenderIsAdmin = (messageId: string | undefined): boolean => {
-  return useMessageIdProps(messageId)?.propsForMessage.isSenderAdmin || false;
+  return useMessagePropsByMessageId(messageId)?.propsForMessage.isSenderAdmin || false;
 };
 
 export const useMessageIsDeletable = (messageId: string | undefined): boolean => {
-  return useMessageIdProps(messageId)?.propsForMessage.isDeletable || false;
+  return useMessagePropsByMessageId(messageId)?.propsForMessage.isDeletable || false;
 };
 
 export const useMessageStatus = (
   messageId: string | undefined
 ): LastMessageStatusType | undefined => {
-  return useMessageIdProps(messageId)?.propsForMessage.status;
+  return useMessagePropsByMessageId(messageId)?.propsForMessage.status;
 };
+
+export function useMessageSender(messageId: string) {
+  return useMessagePropsByMessageId(messageId)?.propsForMessage.sender;
+}
+
+export function useMessageIsDeletableForEveryone(messageId: string) {
+  return useMessagePropsByMessageId(messageId)?.propsForMessage.isDeletableForEveryone;
+}
+
+export function useMessageServerTimestamp(messageId: string) {
+  return useMessagePropsByMessageId(messageId)?.propsForMessage.serverTimestamp;
+}
+
+export function useMessageTimestamp(messageId: string) {
+  return useMessagePropsByMessageId(messageId)?.propsForMessage.timestamp;
+}
+
+export function useMessageBody(messageId: string) {
+  return useMessagePropsByMessageId(messageId)?.propsForMessage.text;
+}
diff --git a/ts/state/selectors/onions.ts b/ts/state/selectors/onions.ts
index 99b9a1ee8a..84764663e7 100644
--- a/ts/state/selectors/onions.ts
+++ b/ts/state/selectors/onions.ts
@@ -2,7 +2,7 @@ import { createSelector } from '@reduxjs/toolkit';
 
 import { StateType } from '../reducer';
 import { OnionState } from '../ducks/onion';
-import { SectionType } from '../../state/ducks/section';
+import { SectionType } from '../ducks/section';
 
 export const getOnionPaths = (state: StateType): OnionState => state.onionPaths;
 
diff --git a/ts/state/selectors/search.ts b/ts/state/selectors/search.ts
index 6238742b84..f8db935d2a 100644
--- a/ts/state/selectors/search.ts
+++ b/ts/state/selectors/search.ts
@@ -28,7 +28,7 @@ const getSearchResults = createSelector(
             // on some edges cases, we have an id but no corresponding convo because it matches a query but the conversation was removed.
             // Don't return anything when activeAt is unset (i.e. no current conversations with this user)
             if (!value || value.activeAt === undefined || value.activeAt === 0) {
-              //activeAt can be 0 when linking device
+              // activeAt can be 0 when linking device
               return false;
             }
 
diff --git a/ts/test/automation/create_user.spec.ts b/ts/test/automation/create_user.spec.ts
index e3e8845242..6829b93cda 100644
--- a/ts/test/automation/create_user.spec.ts
+++ b/ts/test/automation/create_user.spec.ts
@@ -13,9 +13,9 @@ sessionTestOneWindow('Create User', async ([window]) => {
   // Open profile tab
   await clickOnTestIdWithText(window, 'leftpane-primary-avatar');
   await sleepFor(100, true);
-  //check username matches
+  // check username matches
   await waitForTestIdWithText(window, 'your-profile-name', userA.userName);
-  //check session id matches
+  // check session id matches
   await waitForTestIdWithText(window, 'your-session-id', userA.sessionid);
   // exit profile module
   await window.click('.session-icon-button.small');
diff --git a/ts/test/automation/delete_account.spec.ts b/ts/test/automation/delete_account.spec.ts
index caee2934e6..5ca1cdd113 100644
--- a/ts/test/automation/delete_account.spec.ts
+++ b/ts/test/automation/delete_account.spec.ts
@@ -1,11 +1,10 @@
-import { _electron, test } from '@playwright/test';
+import { test } from '@playwright/test';
 import { beforeAllClean, forceCloseAllWindows } from './setup/beforeEach';
 import { newUser } from './setup/new_user';
 import { sendNewMessage } from './utilities/send_message';
 import { clickOnMatchingText, clickOnTestIdWithText, typeIntoInput } from './utilities/utils';
 import { sleepFor } from '../../session/utils/Promise';
 import { openApp } from './setup/open';
-// tslint:disable: no-console
 
 test.beforeEach(beforeAllClean);
 
diff --git a/ts/test/automation/disappearing_messages.spec.ts b/ts/test/automation/disappearing_messages.spec.ts
index 35a218d657..d4cf3a757a 100644
--- a/ts/test/automation/disappearing_messages.spec.ts
+++ b/ts/test/automation/disappearing_messages.spec.ts
@@ -10,8 +10,6 @@ import {
   waitForTestIdWithText,
 } from './utilities/utils';
 
-// tslint:disable: no-console
-
 const testMessage = 'Test-Message- (A -> B) ';
 const sentMessage = `${testMessage}${Date.now()}`;
 
diff --git a/ts/test/automation/linked_device_user.spec.ts b/ts/test/automation/linked_device_user.spec.ts
index bad40ede90..c8af5e0dfd 100644
--- a/ts/test/automation/linked_device_user.spec.ts
+++ b/ts/test/automation/linked_device_user.spec.ts
@@ -21,7 +21,6 @@ const windows: Array<Page> = [];
 test.beforeEach(beforeAllClean);
 
 test.afterEach(() => forceCloseAllWindows(windows));
-// tslint:disable: no-console
 
 test('Link a device', async () => {
   const [windowA] = await openApp(1); // not using sessionTest here as we need to close and reopen one of the window
diff --git a/ts/test/automation/message_checks.spec.ts b/ts/test/automation/message_checks.spec.ts
index fe254cc321..9fc59ce2ce 100644
--- a/ts/test/automation/message_checks.spec.ts
+++ b/ts/test/automation/message_checks.spec.ts
@@ -110,6 +110,7 @@ sessionTestTwoWindows('Send long text and reply test', async ([windowA, windowB]
 
   const testReply = `${userB.userName} replying to long text message from ${userA.userName}`;
   const longText =
+    // eslint-disable-next-line max-len
     'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum quis lacinia mi. Praesent fermentum vehicula rhoncus. Aliquam ac purus lobortis, convallis nisi quis, pulvinar elit. Nam commodo eros in molestie lobortis. Donec at mattis est. In tempor ex nec velit mattis, vitae feugiat augue maximus. Nullam risus libero, bibendum et enim et, viverra viverra est. Suspendisse potenti. Sed ut nibh in sem rhoncus suscipit. Etiam tristique leo sit amet ullamcorper dictum. Suspendisse sollicitudin, lectus et suscipit eleifend, libero dui ultricies neque, non elementum nulla orci bibendum lorem. Suspendisse potenti. Aenean a tellus imperdiet, iaculis metus quis, pretium diam. Nunc varius vitae enim vestibulum interdum. In hac habitasse platea dictumst. Donec auctor sem quis eleifend fermentum. Vestibulum neque nulla, maximus non arcu gravida, condimentum euismod turpis. Cras ac mattis orci. Quisque ac enim pharetra felis sodales eleifend. Aliquam erat volutpat. Donec sit amet mollis nibh, eget feugiat ipsum. Integer vestibulum purus ac suscipit egestas. Duis vitae aliquet ligula.';
 
   await createContact(windowA, windowB, userA, userB);
diff --git a/ts/test/automation/password.spec.ts b/ts/test/automation/password.spec.ts
index 6aef1a7912..b6e5eb8a04 100644
--- a/ts/test/automation/password.spec.ts
+++ b/ts/test/automation/password.spec.ts
@@ -8,7 +8,6 @@ import {
   waitForMatchingText,
   waitForTestIdWithText,
 } from './utilities/utils';
-// tslint:disable: no-console
 
 const testPassword = '123456';
 const newTestPassword = '789101112';
diff --git a/ts/test/automation/setup/beforeEach.ts b/ts/test/automation/setup/beforeEach.ts
index f47f97418a..7ba7bfdeee 100644
--- a/ts/test/automation/setup/beforeEach.ts
+++ b/ts/test/automation/setup/beforeEach.ts
@@ -4,7 +4,6 @@ import { join } from 'path';
 import { homedir } from 'os';
 import { isLinux, isMacOS } from '../../../OS';
 import { MULTI_PREFIX, NODE_ENV } from './open';
-// tslint:disable: no-console
 
 const getDirectoriesOfSessionDataPath = (source: string) =>
   readdirSync(source, { withFileTypes: true })
@@ -41,7 +40,7 @@ function cleanUpOtherTest() {
   const allAppDataPath = getDirectoriesOfSessionDataPath(parentFolderOfAllDataPath);
   console.info('allAppDataPath', allAppDataPath);
 
-  allAppDataPath.map(folder => {
+  allAppDataPath.forEach(folder => {
     const pathToRemove = join(parentFolderOfAllDataPath, folder);
     rmdirSync(pathToRemove, { recursive: true });
   });
diff --git a/ts/test/automation/setup/create_group.ts b/ts/test/automation/setup/create_group.ts
index 08aaf086e1..fb6496cf46 100644
--- a/ts/test/automation/setup/create_group.ts
+++ b/ts/test/automation/setup/create_group.ts
@@ -1,4 +1,4 @@
-import { _electron, Page } from '@playwright/test';
+import { Page } from '@playwright/test';
 import { sendMessage } from '../utilities/message';
 import { sendNewMessage } from '../utilities/send_message';
 import {
diff --git a/ts/test/automation/setup/new_user.ts b/ts/test/automation/setup/new_user.ts
index 7ddf1536d8..1139092892 100644
--- a/ts/test/automation/setup/new_user.ts
+++ b/ts/test/automation/setup/new_user.ts
@@ -2,13 +2,13 @@ import { Page } from '@playwright/test';
 import { User } from '../types/testing';
 import { clickOnMatchingText, typeIntoInput } from '../utilities/utils';
 import { sleepFor } from '../../../session/utils/Promise';
-// tslint:disable: no-console
+
 export const newUser = async (window: Page, userName: string): Promise<User> => {
   // Create User
   await clickOnMatchingText(window, 'Create Session ID');
   // Wait for animation for finish creating ID
   await sleepFor(2500);
-  //Save session ID to a variable
+  // Save session ID to a variable
   const sessionid = await window.inputValue('[data-testid=session-id-signup]');
   await clickOnMatchingText(window, 'Continue');
   // Input username = testuser
diff --git a/ts/test/automation/setup/open.ts b/ts/test/automation/setup/open.ts
index 61f380d639..35529b6b4b 100644
--- a/ts/test/automation/setup/open.ts
+++ b/ts/test/automation/setup/open.ts
@@ -5,7 +5,6 @@ import { getAppRootPath } from '../../../node/getRootPath';
 export const NODE_ENV = 'production';
 export const MULTI_PREFIX = 'test-integration-testnet-';
 const multisAvailable = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ';
-// tslint:disable: no-console
 
 export async function openApp(windowsToCreate: number) {
   if (windowsToCreate >= multisAvailable.length) {
diff --git a/ts/test/automation/setup/recovery_using_seed.ts b/ts/test/automation/setup/recovery_using_seed.ts
index 34a1765ebf..d2b0333711 100644
--- a/ts/test/automation/setup/recovery_using_seed.ts
+++ b/ts/test/automation/setup/recovery_using_seed.ts
@@ -1,4 +1,4 @@
-import { _electron, Page } from '@playwright/test';
+import { Page } from '@playwright/test';
 import { clickOnTestIdWithText, typeIntoInput } from '../utilities/utils';
 
 export async function recoverFromSeed(window: Page, userName: string, recoveryPhrase: string) {
diff --git a/ts/test/automation/setup/sessionTest.ts b/ts/test/automation/setup/sessionTest.ts
index 4b92a80c8d..e9a80de16f 100644
--- a/ts/test/automation/setup/sessionTest.ts
+++ b/ts/test/automation/setup/sessionTest.ts
@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/array-type */
 import { Page, test } from '@playwright/test';
 import { beforeAllClean, forceCloseAllWindows } from './beforeEach';
 import { openApp } from './open';
@@ -31,6 +32,7 @@ function sessionTest<T extends CountWindows, N extends Tuple<Page, T>>(
         throw new Error(`openApp should have opened ${count} windows but did not.`);
       }
       await testCallback(windows as N);
+      // eslint-disable-next-line no-useless-catch
     } catch (e) {
       throw e;
     } finally {
diff --git a/ts/test/automation/setup/test_user.ts b/ts/test/automation/setup/test_user.ts
index 1af13715d3..960219c674 100644
--- a/ts/test/automation/setup/test_user.ts
+++ b/ts/test/automation/setup/test_user.ts
@@ -1,5 +1,3 @@
-import { _electron } from '@playwright/test';
-
 export const userA = {
   userName: 'Alice',
   sessionid: '059e36f9bb03ac4e1ff9ff7d4aedd791d1f412770c6cd2796b855af12a7c7ea000',
diff --git a/ts/test/automation/tslint.json b/ts/test/automation/tslint.json
deleted file mode 100644
index ff7a903b3d..0000000000
--- a/ts/test/automation/tslint.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "defaultSeverity": "error",
-  "extends": ["../tslint.json"],
-  "rules": {
-    "no-empty": false,
-    "array-type": false,
-    "no-console": false,
-    "no-void-expression": false
-  }
-}
diff --git a/ts/test/automation/user_actions.spec.ts b/ts/test/automation/user_actions.spec.ts
index d264764407..f70af5594d 100644
--- a/ts/test/automation/user_actions.spec.ts
+++ b/ts/test/automation/user_actions.spec.ts
@@ -46,7 +46,7 @@ sessionTestTwoWindows('Block user in conversation options', async ([windowA, win
   // Check to see if User B is a contact
   await clickOnTestIdWithText(windowA, 'new-conversation-button');
   await waitForTestIdWithText(windowA, 'module-conversation__user__profile-name', userB.userName);
-  //Click on three dots menu
+  // Click on three dots menu
   await clickOnTestIdWithText(windowA, 'message-section');
 
   await clickOnTestIdWithText(windowA, 'three-dots-conversation-options');
@@ -83,7 +83,7 @@ sessionTestTwoWindows('Block user in conversation list', async ([windowA, window
   // Check to see if User B is a contact
   await clickOnTestIdWithText(windowA, 'new-conversation-button');
   await waitForTestIdWithText(windowA, 'module-conversation__user__profile-name', userB.userName);
-  //Click on three dots menu
+  // Click on three dots menu
   await clickOnTestIdWithText(windowA, 'message-section');
 
   await clickOnTestIdWithText(
diff --git a/ts/test/automation/utilities/leave_group.ts b/ts/test/automation/utilities/leave_group.ts
index e23f86aebd..84cd0b2597 100644
--- a/ts/test/automation/utilities/leave_group.ts
+++ b/ts/test/automation/utilities/leave_group.ts
@@ -1,4 +1,4 @@
-import { _electron, Page } from '@playwright/test';
+import {  Page } from '@playwright/test';
 import { clickOnMatchingText, clickOnTestIdWithText, waitForTestIdWithText } from './utils';
 
 export const leaveGroup = async (window: Page) => {
diff --git a/ts/test/automation/utilities/linked_device.ts b/ts/test/automation/utilities/linked_device.ts
index 2db8d7165c..0dc169e1c1 100644
--- a/ts/test/automation/utilities/linked_device.ts
+++ b/ts/test/automation/utilities/linked_device.ts
@@ -1,4 +1,3 @@
-import { _electron } from 'playwright-core';
 import { logIn } from '../setup/log_in';
 import { openApp } from '../setup/open';
 
diff --git a/ts/test/automation/utilities/message.ts b/ts/test/automation/utilities/message.ts
index a2282d27a7..18799eb50b 100644
--- a/ts/test/automation/utilities/message.ts
+++ b/ts/test/automation/utilities/message.ts
@@ -1,6 +1,5 @@
-import { _electron, Page } from '@playwright/test';
+import { Page } from '@playwright/test';
 import { clickOnTestIdWithText, typeIntoInput } from './utils';
-// tslint:disable: no-console
 
 export const sendMessage = async (window: Page, message: string) => {
   // type into message input box
diff --git a/ts/test/automation/utilities/rename_group.ts b/ts/test/automation/utilities/rename_group.ts
index e3e3d6751f..2c5981f341 100644
--- a/ts/test/automation/utilities/rename_group.ts
+++ b/ts/test/automation/utilities/rename_group.ts
@@ -1,4 +1,4 @@
-import { _electron, Page } from '@playwright/test';
+import { Page } from '@playwright/test';
 import {
   clickOnMatchingText,
   clickOnTestIdWithText,
diff --git a/ts/test/automation/utilities/send_message.ts b/ts/test/automation/utilities/send_message.ts
index 27e818f0f3..aa716348e8 100644
--- a/ts/test/automation/utilities/send_message.ts
+++ b/ts/test/automation/utilities/send_message.ts
@@ -1,4 +1,4 @@
-import { _electron, Page } from '@playwright/test';
+import { Page } from '@playwright/test';
 import { sendMessage } from './message';
 import { clickOnTestIdWithText, typeIntoInput } from './utils';
 
diff --git a/ts/test/automation/utilities/utils.ts b/ts/test/automation/utilities/utils.ts
index 06d5a022df..94e8a10ead 100644
--- a/ts/test/automation/utilities/utils.ts
+++ b/ts/test/automation/utilities/utils.ts
@@ -1,8 +1,11 @@
-import { ElementHandle } from '@playwright/test';
+/* eslint-disable no-useless-escape */
+/* eslint-disable import/no-extraneous-dependencies */
+/* eslint-disable no-await-in-loop */
 import { Page } from 'playwright-core';
+
+import { ElementHandle } from '@playwright/test';
 import { sleepFor } from '../../../session/utils/Promise';
 import { loaderType, Strategy } from '../types/testing';
-// tslint:disable: no-console
 
 // WAIT FOR FUNCTIONS
 
@@ -11,7 +14,7 @@ export async function waitForTestIdWithText(window: Page, dataTestId: string, te
   if (text) {
     // " =>  \\\"
     /* prettier-ignore */
-    // tslint:disable-next-line: quotemark
+
     const escapedText = text.replace(/"/g, '\\\"');
 
     builtSelector += `:has-text("${escapedText}")`;
@@ -41,7 +44,7 @@ export async function waitForTextMessage(window: Page, text: string, maxWait?: n
   if (text) {
     // " =>  \\\"
     /* prettier-ignore */
-    // tslint:disable-next-line: quotemark
+
     const escapedText = text.replace(/"/g, '\\\"');
 
     builtSelector += `:has-text("${escapedText}")`;
@@ -99,7 +102,6 @@ export async function clickOnElement(
   const builtSelector = `css=[${strategy}=${selector}]`;
   await window.waitForSelector(builtSelector, { timeout: maxWait });
   await window.click(builtSelector);
-  return;
 }
 
 export async function clickOnMatchingText(window: Page, text: string, rightButton = false) {
@@ -114,7 +116,7 @@ export async function clickOnTestIdWithText(
   rightButton?: boolean,
   maxWait?: number
 ) {
-  console.info(`clickOnTestIdWithText with testId:${dataTestId} and text:${text ? text : 'none'}`);
+  console.info(`clickOnTestIdWithText with testId:${dataTestId} and text:${text || 'none'}`);
 
   const builtSelector = !text
     ? `css=[data-testid=${dataTestId}]`
diff --git a/ts/test/components/media-gallery/groupMessagesByDate_test.ts b/ts/test/components/media-gallery/groupMessagesByDate_test.ts
index 8f572f7d7d..fc7cd0e060 100644
--- a/ts/test/components/media-gallery/groupMessagesByDate_test.ts
+++ b/ts/test/components/media-gallery/groupMessagesByDate_test.ts
@@ -30,7 +30,6 @@ const toMediaItem = (date: Date): MediaItemType => ({
   messageId: '123456',
 });
 
-// tslint:disable: max-func-body-length
 describe('groupMediaItemsByDate', () => {
   it('should group mediaItems', () => {
     const referenceTime = new Date('2018-04-12T18:00Z').getTime(); // Thu
diff --git a/ts/test/session/unit/crypto/MessageEncrypter_test.ts b/ts/test/session/unit/crypto/MessageEncrypter_test.ts
index b095cd13a2..d2de24cfe1 100644
--- a/ts/test/session/unit/crypto/MessageEncrypter_test.ts
+++ b/ts/test/session/unit/crypto/MessageEncrypter_test.ts
@@ -1,19 +1,19 @@
 import chai, { expect } from 'chai';
 import * as crypto from 'crypto';
 import Sinon, * as sinon from 'sinon';
+import chaiBytes from 'chai-bytes';
+
 import { concatUInt8Array, getSodiumRenderer, MessageEncrypter } from '../../../../session/crypto';
 import { TestUtils } from '../../../test-utils';
 import { SignalService } from '../../../../protobuf';
 
 import { StringUtils, UserUtils } from '../../../../session/utils';
 
-import chaiBytes from 'chai-bytes';
 import { PubKey } from '../../../../session/types';
 import { fromHex, toHex } from '../../../../session/utils/String';
 import { addMessagePadding } from '../../../../session/crypto/BufferPadding';
 import { SessionKeyPair } from '../../../../receiver/keypairs';
 
-// tslint:disable-next-line: variable-name
 export const TEST_identityKeyPair: SessionKeyPair = {
   pubKey: new Uint8Array([
     5,
@@ -92,7 +92,6 @@ export const TEST_identityKeyPair: SessionKeyPair = {
 };
 chai.use(chaiBytes);
 
-// tslint:disable-next-line: max-func-body-length
 describe('MessageEncrypter', () => {
   const ourNumber = '0123456789abcdef';
   const ourUserEd25516Keypair = {
@@ -154,7 +153,6 @@ describe('MessageEncrypter', () => {
     });
   });
 
-  // tslint:disable-next-line: max-func-body-length
   describe('Session Protocol', () => {
     beforeEach(() => {
       Sinon.stub(UserUtils, 'getIdentityKeyPair').resolves(TEST_identityKeyPair);
@@ -186,10 +184,7 @@ describe('MessageEncrypter', () => {
       const cryptoSignDetachedSpy = Sinon.spy(sodium, 'crypto_sign_detached');
       const plainText = '123456';
       const plainTextBytes = new Uint8Array(StringUtils.encode(plainText, 'utf8'));
-      const userED25519PubKeyBytes = new Uint8Array(
-        // tslint:disable: no-non-null-assertion
-        StringUtils.fromHex(keypair!.pubKey)
-      );
+      const userED25519PubKeyBytes = new Uint8Array(StringUtils.fromHex(keypair!.pubKey));
       const recipientX25519PublicKeyWithoutPrefix = PubKey.removePrefixIfNeeded(recipient.key);
 
       const recipientX25519PublicKey = new Uint8Array(
diff --git a/ts/test/session/unit/crypto/OpenGroupAuthentication_test.ts b/ts/test/session/unit/crypto/OpenGroupAuthentication_test.ts
index 88c153a4f6..f925d4c453 100644
--- a/ts/test/session/unit/crypto/OpenGroupAuthentication_test.ts
+++ b/ts/test/session/unit/crypto/OpenGroupAuthentication_test.ts
@@ -1,16 +1,16 @@
+import { fromBase64, fromHex } from 'bytebuffer';
 import chai, { expect } from 'chai';
 import chaiBytes from 'chai-bytes';
-import { SogsBlinding } from '../../../../session/apis/open_group_api/sogsv3/sogsBlinding';
-import { ByteKeyPair } from '../../../../session/utils/User';
 import { to_hex } from 'libsodium-wrappers-sumo';
-import { fromBase64, fromHex } from 'bytebuffer';
-import { StringUtils } from '../../../../session/utils';
+
+import { SogsBlinding } from '../../../../session/apis/open_group_api/sogsv3/sogsBlinding';
 import { concatUInt8Array, getSodiumRenderer } from '../../../../session/crypto';
 import { KeyPrefixType } from '../../../../session/types';
+import { StringUtils } from '../../../../session/utils';
+import { ByteKeyPair } from '../../../../session/utils/User';
 
 chai.use(chaiBytes);
 
-// tslint:disable-next-line: max-func-body-length
 describe('OpenGroupAuthentication', () => {
   const secondPartPrivKey = new Uint8Array([
     186,
@@ -201,7 +201,6 @@ describe('OpenGroupAuthentication', () => {
 
   const body = 'hello 🎂';
 
-  // tslint:disable-next-line: max-func-body-length
   describe('HeaderCreation', () => {
     describe('Blinded Headers', () => {
       it('should produce correct X-SOGS-Nonce', async () => {
@@ -421,7 +420,7 @@ const decryptBlindedMessage = async (
     window?.log?.error(
       'decryptBlindedMessage - Dropping message due to unsupported encryption version'
     );
-    return;
+    return undefined;
   }
 
   const nonceLength = sodium.crypto_aead_xchacha20poly1305_ietf_NPUBBYTES;
@@ -439,7 +438,7 @@ const decryptBlindedMessage = async (
   if (plaintextIncoming.length <= 32) {
     // throw Error;
     window?.log?.error('decryptBlindedMessage: plaintext insufficient length');
-    return;
+    return undefined;
   }
 
   const msg = plaintextIncoming.slice(0, plaintextIncoming.length - 32);
diff --git a/ts/test/session/unit/decrypted_attachments/decryptedAttachmentsManager_test.ts b/ts/test/session/unit/decrypted_attachments/decryptedAttachmentsManager_test.ts
index afec9950e7..983da4ca60 100644
--- a/ts/test/session/unit/decrypted_attachments/decryptedAttachmentsManager_test.ts
+++ b/ts/test/session/unit/decrypted_attachments/decryptedAttachmentsManager_test.ts
@@ -3,10 +3,8 @@ import { beforeEach } from 'mocha';
 import Sinon from 'sinon';
 import * as DecryptedAttachmentsManager from '../../../../session/crypto/DecryptedAttachmentsManager';
 import { TestUtils } from '../../../test-utils';
-// tslint:disable: chai-vague-errors no-unused-expression
 
 describe('DecryptedAttachmentsManager', () => {
-  // tslint:disable-next-line: no-empty
   beforeEach(() => {
     DecryptedAttachmentsManager.resetDecryptedUrlForTesting();
     TestUtils.stubWindowLog();
@@ -135,7 +133,7 @@ describe('DecryptedAttachmentsManager', () => {
         expect(resolved2.startsWith(now2.slice(0, 9))).to.be.true;
       });
     });
-  }); // tslint:disable: no-empty
+  });
 
   it.skip('cleanUpOldDecryptedMedias', () => {});
   it.skip('getDecryptedBlob', () => {});
diff --git a/ts/test/session/unit/libsession_wrapper/libsession_wrapper_contacts_test.ts b/ts/test/session/unit/libsession_wrapper/libsession_wrapper_contacts_test.ts
index 5880651549..b5763c03a6 100644
--- a/ts/test/session/unit/libsession_wrapper/libsession_wrapper_contacts_test.ts
+++ b/ts/test/session/unit/libsession_wrapper/libsession_wrapper_contacts_test.ts
@@ -9,9 +9,6 @@ import {
 import { UserUtils } from '../../../../session/utils';
 import { SessionUtilContact } from '../../../../session/utils/libsession/libsession_utils_contacts';
 
-// tslint:disable: chai-vague-errors no-unused-expression no-http-string no-octal-literal whitespace no-require-imports variable-name
-
-// tslint:disable-next-line: max-func-body-length
 describe('libsession_contacts', () => {
   describe('filter contacts for wrapper', () => {
     const ourNumber = '051234567890acbdef';
diff --git a/ts/test/session/unit/libsession_wrapper/libsession_wrapper_test.ts b/ts/test/session/unit/libsession_wrapper/libsession_wrapper_test.ts
index 27c8370384..1af72e7fcd 100644
--- a/ts/test/session/unit/libsession_wrapper/libsession_wrapper_test.ts
+++ b/ts/test/session/unit/libsession_wrapper/libsession_wrapper_test.ts
@@ -1,6 +1,8 @@
+/* eslint-disable no-unused-expressions */
 import { expect } from 'chai';
-import { SessionUtilUserProfile } from '../../../../session/utils/libsession/libsession_utils_user_profile';
 import Sinon from 'sinon';
+
+import { SessionUtilUserProfile } from '../../../../session/utils/libsession/libsession_utils_user_profile';
 import { UserUtils } from '../../../../session/utils';
 import { TestUtils } from '../../../test-utils';
 
diff --git a/ts/test/session/unit/libsession_wrapper/libsession_wrapper_usergroups_test.ts b/ts/test/session/unit/libsession_wrapper/libsession_wrapper_usergroups_test.ts
index 166ce063f5..9eb29164a6 100644
--- a/ts/test/session/unit/libsession_wrapper/libsession_wrapper_usergroups_test.ts
+++ b/ts/test/session/unit/libsession_wrapper/libsession_wrapper_usergroups_test.ts
@@ -9,9 +9,6 @@ import {
 import { UserUtils } from '../../../../session/utils';
 import { SessionUtilUserGroups } from '../../../../session/utils/libsession/libsession_utils_user_groups';
 
-// tslint:disable: chai-vague-errors no-unused-expression no-http-string no-octal-literal whitespace no-require-imports variable-name
-
-// tslint:disable-next-line: max-func-body-length
 describe('libsession_groups', () => {
   describe('filter user groups for wrapper', () => {
     const ourNumber = '051234567890acbdef';
diff --git a/ts/test/session/unit/messages/ChatMessage_test.ts b/ts/test/session/unit/messages/ChatMessage_test.ts
index 0f30d6a9bc..7fb84974b1 100644
--- a/ts/test/session/unit/messages/ChatMessage_test.ts
+++ b/ts/test/session/unit/messages/ChatMessage_test.ts
@@ -1,8 +1,8 @@
 import { expect } from 'chai';
 
-import { SignalService } from '../../../../protobuf';
 import { TextEncoder } from 'util';
 import { toNumber } from 'lodash';
+import { SignalService } from '../../../../protobuf';
 import { Constants } from '../../../../session';
 import {
   AttachmentPointerWithUrl,
@@ -52,7 +52,7 @@ describe('VisibleMessage', () => {
     };
     const message = new VisibleMessage({
       timestamp: Date.now(),
-      lokiProfile: lokiProfile,
+      lokiProfile,
     });
     const plainText = message.plainTextBuffer();
     const decoded = SignalService.Content.decode(plainText);
@@ -68,9 +68,7 @@ describe('VisibleMessage', () => {
   });
 
   it('can create message with a quote without attachments', () => {
-    let quote: Quote;
-
-    quote = { id: 1234, author: 'author', text: 'text' };
+    const quote: Quote = { id: 1234, author: 'author', text: 'text' };
     const message = new VisibleMessage({
       timestamp: Date.now(),
       quote,
@@ -84,9 +82,7 @@ describe('VisibleMessage', () => {
   });
 
   it('can create message with a preview', () => {
-    let preview: PreviewWithAttachmentUrl;
-
-    preview = { url: 'url', title: 'title', id: 1 };
+    const preview: PreviewWithAttachmentUrl = { url: 'url', title: 'title', id: 1 };
     const previews = new Array<PreviewWithAttachmentUrl>();
     previews.push(preview);
 
@@ -106,15 +102,17 @@ describe('VisibleMessage', () => {
   });
 
   it('can create message with an AttachmentPointer', () => {
-    let attachment: AttachmentPointerWithUrl;
-
-    attachment = { url: 'url', contentType: 'contentType', id: 1234 };
+    const attachment: AttachmentPointerWithUrl = {
+      url: 'url',
+      contentType: 'contentType',
+      id: 1234,
+    };
     const attachments = new Array<AttachmentPointerWithUrl>();
     attachments.push(attachment);
 
     const message = new VisibleMessage({
       timestamp: Date.now(),
-      attachments: attachments,
+      attachments,
     });
     const plainText = message.plainTextBuffer();
     const decoded = SignalService.Content.decode(plainText);
diff --git a/ts/test/session/unit/messages/ConfigurationMessage_test.ts b/ts/test/session/unit/messages/ConfigurationMessage_test.ts
index fb8d7060e2..ca541a7769 100644
--- a/ts/test/session/unit/messages/ConfigurationMessage_test.ts
+++ b/ts/test/session/unit/messages/ConfigurationMessage_test.ts
@@ -9,7 +9,6 @@ import {
 } from '../../../../session/messages/outgoing/controlMessage/ConfigurationMessage';
 import { TestUtils } from '../../../test-utils';
 
-// tslint:disable-next-line: max-func-body-length
 describe('ConfigurationMessage', () => {
   it('throw if closed group is not set', () => {
     const activeClosedGroups = null as any;
diff --git a/ts/test/session/unit/messages/MessageRequestResponse_test.ts b/ts/test/session/unit/messages/MessageRequestResponse_test.ts
index 85da9a9651..6473a562bb 100644
--- a/ts/test/session/unit/messages/MessageRequestResponse_test.ts
+++ b/ts/test/session/unit/messages/MessageRequestResponse_test.ts
@@ -4,9 +4,7 @@ import { v4 } from 'uuid';
 import { SignalService } from '../../../../protobuf';
 import { Constants } from '../../../../session';
 import { MessageRequestResponse } from '../../../../session/messages/outgoing/controlMessage/MessageRequestResponse';
-// tslint:disable: no-unused-expression
 
-// tslint:disable-next-line: max-func-body-length
 describe('MessageRequestResponse', () => {
   let message: MessageRequestResponse | undefined;
   it('correct ttl', () => {
diff --git a/ts/test/session/unit/messages/ReceiptMessage_test.ts b/ts/test/session/unit/messages/ReceiptMessage_test.ts
index e4c479be36..977f94699f 100644
--- a/ts/test/session/unit/messages/ReceiptMessage_test.ts
+++ b/ts/test/session/unit/messages/ReceiptMessage_test.ts
@@ -1,8 +1,8 @@
 import { expect } from 'chai';
 import { beforeEach } from 'mocha';
+import { toNumber } from 'lodash';
 
 import { SignalService } from '../../../../protobuf';
-import { toNumber } from 'lodash';
 import { Constants } from '../../../../session';
 import { ReadReceiptMessage } from '../../../../session/messages/outgoing/controlMessage/receipt/ReadReceiptMessage';
 
diff --git a/ts/test/session/unit/messages/TypingMessage_test.ts b/ts/test/session/unit/messages/TypingMessage_test.ts
index 09ff222779..621d5f8779 100644
--- a/ts/test/session/unit/messages/TypingMessage_test.ts
+++ b/ts/test/session/unit/messages/TypingMessage_test.ts
@@ -1,8 +1,8 @@
 import { expect } from 'chai';
 
-import { SignalService } from '../../../../protobuf';
 import Long from 'long';
 import { toNumber } from 'lodash';
+import { SignalService } from '../../../../protobuf';
 import { Constants } from '../../../../session';
 import { TypingMessage } from '../../../../session/messages/outgoing/controlMessage/TypingMessage';
 
diff --git a/ts/test/session/unit/models/ConversationModels_test.ts b/ts/test/session/unit/models/ConversationModels_test.ts
index f5c8babf04..1eab0e6f40 100644
--- a/ts/test/session/unit/models/ConversationModels_test.ts
+++ b/ts/test/session/unit/models/ConversationModels_test.ts
@@ -1,5 +1,3 @@
-// tslint:disable: no-implicit-dependencies max-func-body-length no-unused-expression
-
 import { expect } from 'chai';
 import { describe } from 'mocha';
 import {
@@ -8,7 +6,6 @@ import {
   fillConvoAttributesWithDefaults,
 } from '../../../../models/conversationAttributes';
 
-// tslint:disable-next-line: max-func-body-length
 describe('fillConvoAttributesWithDefaults', () => {
   describe('members', () => {
     it('initialize members if they are not given', () => {
diff --git a/ts/test/session/unit/models/formatRowOfConversation_test.ts b/ts/test/session/unit/models/formatRowOfConversation_test.ts
index 4efc4c9b38..636c85a4ba 100644
--- a/ts/test/session/unit/models/formatRowOfConversation_test.ts
+++ b/ts/test/session/unit/models/formatRowOfConversation_test.ts
@@ -1,5 +1,3 @@
-// tslint:disable: no-implicit-dependencies max-func-body-length no-unused-expression
-
 import { expect } from 'chai';
 import { describe } from 'mocha';
 import {
@@ -9,7 +7,6 @@ import {
 } from '../../../../models/conversationAttributes';
 import { formatRowOfConversation } from '../../../../node/database_utility';
 
-// tslint:disable-next-line: max-func-body-length
 describe('formatRowOfConversation', () => {
   describe('isTrustedForAttachmentDownload', () => {
     it('initialize isTrustedForAttachmentDownload if they are not given', () => {
diff --git a/ts/test/session/unit/onion/GuardNodes_test.ts b/ts/test/session/unit/onion/GuardNodes_test.ts
index 39cecc72e5..9c731074dc 100644
--- a/ts/test/session/unit/onion/GuardNodes_test.ts
+++ b/ts/test/session/unit/onion/GuardNodes_test.ts
@@ -1,15 +1,12 @@
-// tslint:disable: no-implicit-dependencies max-func-body-length no-unused-expression
-
 import chai from 'chai';
 import Sinon, * as sinon from 'sinon';
-import _ from 'lodash';
 import { describe } from 'mocha';
+import chaiAsPromised from 'chai-as-promised';
 
 import { TestUtils } from '../../../test-utils';
 import { Onions, SnodePool } from '../../../../session/apis/snode_api';
 import { Snode } from '../../../../data/data';
 
-import chaiAsPromised from 'chai-as-promised';
 import * as OnionPaths from '../../../../session/onions/onionPath';
 import {
   generateFakeSnodes,
@@ -17,6 +14,7 @@ import {
   stubData,
 } from '../../../test-utils/utils';
 import { SeedNodeAPI } from '../../../../session/apis/seed_node_api';
+
 chai.use(chaiAsPromised as any);
 chai.should();
 
@@ -34,9 +32,6 @@ const fakeSnodePool: Array<Snode> = [
   ...generateFakeSnodes(3),
 ];
 
-// tslint:disable: variable-name
-
-// tslint:disable-next-line: max-func-body-length
 describe('GuardNodes', () => {
   let getSnodePoolFromDBOrFetchFromSeed: sinon.SinonStub;
   let fetchFromSeedWithRetriesAndWriteToDb: sinon.SinonStub;
diff --git a/ts/test/session/unit/onion/OnionErrors_test.ts b/ts/test/session/unit/onion/OnionErrors_test.ts
index 9b8723411d..38fd3553be 100644
--- a/ts/test/session/unit/onion/OnionErrors_test.ts
+++ b/ts/test/session/unit/onion/OnionErrors_test.ts
@@ -1,21 +1,19 @@
-// tslint:disable: no-implicit-dependencies max-func-body-length no-unused-expression
-
 import chai from 'chai';
 import Sinon, * as sinon from 'sinon';
 import { describe } from 'mocha';
+import chaiAsPromised from 'chai-as-promised';
+import AbortController from 'abort-controller';
 
 import { TestUtils } from '../../../test-utils';
 import * as SnodeAPI from '../../../../session/apis/snode_api';
 
-import chaiAsPromised from 'chai-as-promised';
-import { OnionPaths } from '../../../../session/onions/';
+import { OnionPaths } from '../../../../session/onions';
 import {
   NEXT_NODE_NOT_FOUND_PREFIX,
   Onions,
   OXEN_SERVER_ERROR,
 } from '../../../../session/apis/snode_api/onions';
-import AbortController from 'abort-controller';
-import { Snode } from '../../../../../ts/data/data';
+import { Snode } from '../../../../data/data';
 import { pathFailureCount } from '../../../../session/onions/onionPath';
 import { SeedNodeAPI } from '../../../../session/apis/seed_node_api';
 import { generateFakeSnodeWithEdKey, stubData } from '../../../test-utils/utils';
@@ -43,7 +41,6 @@ const getFakeResponseOnDestination = (statusCode?: number, body?: string) => {
   };
 };
 
-// tslint:disable-next-line: max-func-body-length
 describe('OnionPathsErrors', () => {
   // Initialize new stubbed cache
   let updateSwarmSpy: sinon.SinonStub;
@@ -54,15 +51,15 @@ describe('OnionPathsErrors', () => {
   let incrementBadSnodeCountOrDropSpy: sinon.SinonSpy;
 
   let updateGuardNodesStub: sinon.SinonStub;
-  // tslint:disable-next-line: one-variable-per-declaration
-  let guardPubkeys: Array<string>,
-    otherNodesPubkeys: Array<string>,
-    guardNodesArray: Array<Snode>,
-    guardSnode1: Snode,
-    otherNodesArray: Array<Snode>,
-    fakeSnodePool: Array<Snode>,
-    associatedWith: string,
-    fakeSwarmForAssociatedWith: Array<string>;
+
+  let guardPubkeys: Array<string>;
+  let otherNodesPubkeys: Array<string>;
+  let guardNodesArray: Array<Snode>;
+  let guardSnode1: Snode;
+  let otherNodesArray: Array<Snode>;
+  let fakeSnodePool: Array<Snode>;
+  let associatedWith: string;
+  let fakeSwarmForAssociatedWith: Array<string>;
 
   let oldOnionPaths: Array<Array<Snode>>;
 
diff --git a/ts/test/session/unit/onion/OnionPaths_test.ts b/ts/test/session/unit/onion/OnionPaths_test.ts
index bd62a2ed10..c30b8517ec 100644
--- a/ts/test/session/unit/onion/OnionPaths_test.ts
+++ b/ts/test/session/unit/onion/OnionPaths_test.ts
@@ -1,14 +1,12 @@
-// tslint:disable: no-implicit-dependencies max-func-body-length no-unused-expression
-
 import chai from 'chai';
 import Sinon from 'sinon';
 import _ from 'lodash';
 import { describe } from 'mocha';
+import chaiAsPromised from 'chai-as-promised';
 
 import { TestUtils } from '../../../test-utils';
 import * as SNodeAPI from '../../../../session/apis/snode_api';
 
-import chaiAsPromised from 'chai-as-promised';
 import * as OnionPaths from '../../../../session/onions/onionPath';
 import { GuardNode, Snode } from '../../../../data/data';
 import {
@@ -18,6 +16,7 @@ import {
 } from '../../../test-utils/utils';
 import { SeedNodeAPI } from '../../../../session/apis/seed_node_api';
 import { ServiceNodesList } from '../../../../session/apis/snode_api/getServiceNodesList';
+
 chai.use(chaiAsPromised as any);
 chai.should();
 
@@ -43,7 +42,6 @@ const fakeGuardNodesFromDB: Array<GuardNode> = fakeGuardNodesEd25519.map(ed25519
   };
 });
 
-// tslint:disable-next-line: max-func-body-length
 describe('OnionPaths', () => {
   // Initialize new stubbed cache
   let oldOnionPaths: Array<Array<Snode>>;
@@ -60,7 +58,6 @@ describe('OnionPaths', () => {
       TestUtils.stubData('getGuardNodes').resolves(fakeGuardNodesFromDB);
       TestUtils.stubData('createOrUpdateItem').resolves();
       TestUtils.stubWindow('getSeedNodeList', () => ['seednode1']);
-      // tslint:disable: no-void-expression no-console
 
       TestUtils.stubWindowLog();
 
diff --git a/ts/test/session/unit/onion/SeedNodeAPI_test.ts b/ts/test/session/unit/onion/SeedNodeAPI_test.ts
index d46dbaeb33..4d2d335c82 100644
--- a/ts/test/session/unit/onion/SeedNodeAPI_test.ts
+++ b/ts/test/session/unit/onion/SeedNodeAPI_test.ts
@@ -1,19 +1,17 @@
-// tslint:disable: no-implicit-dependencies max-func-body-length no-unused-expression
-
 import chai from 'chai';
 import Sinon from 'sinon';
-import _ from 'lodash';
+import chaiAsPromised from 'chai-as-promised';
 import { describe } from 'mocha';
 
 import { TestUtils } from '../../../test-utils';
 import { Onions, SnodePool } from '../../../../session/apis/snode_api';
 
-import chaiAsPromised from 'chai-as-promised';
 import * as OnionPaths from '../../../../session/onions/onionPath';
 import { generateFakeSnodes, generateFakeSnodeWithEdKey } from '../../../test-utils/utils';
 import { SeedNodeAPI } from '../../../../session/apis/seed_node_api';
 import { SnodeFromSeed } from '../../../../session/apis/seed_node_api/SeedNodeAPI';
 import { Snode } from '../../../../data/data';
+
 chai.use(chaiAsPromised as any);
 chai.should();
 
@@ -39,9 +37,7 @@ const fakeSnodePoolFromSeedNode: Array<SnodeFromSeed> = fakeSnodePool.map(m => {
     pubkey_ed25519: m.pubkey_ed25519,
   };
 });
-// tslint:disable: variable-name
 
-// tslint:disable-next-line: max-func-body-length
 describe('SeedNodeAPI', () => {
   // Initialize new stubbed cache
 
diff --git a/ts/test/session/unit/onion/SnodeNamespace_test.ts b/ts/test/session/unit/onion/SnodeNamespace_test.ts
index b6a88952a7..11fd317801 100644
--- a/ts/test/session/unit/onion/SnodeNamespace_test.ts
+++ b/ts/test/session/unit/onion/SnodeNamespace_test.ts
@@ -2,7 +2,6 @@ import { expect } from 'chai';
 import Sinon from 'sinon';
 import { SnodeNamespace } from '../../../../session/apis/snode_api/namespaces';
 
-// tslint:disable-next-line: max-func-body-length
 describe('Snode namespaces', () => {
   describe('maxSizeMap', () => {
     afterEach(() => {
diff --git a/ts/test/session/unit/onion/SnodePoolUpdate_test.ts b/ts/test/session/unit/onion/SnodePoolUpdate_test.ts
index 0a4b5350f1..f3d9f950a8 100644
--- a/ts/test/session/unit/onion/SnodePoolUpdate_test.ts
+++ b/ts/test/session/unit/onion/SnodePoolUpdate_test.ts
@@ -1,15 +1,12 @@
-// tslint:disable: no-implicit-dependencies max-func-body-length no-unused-expression
-
 import chai from 'chai';
 import Sinon, * as sinon from 'sinon';
-import _ from 'lodash';
 import { describe } from 'mocha';
+import chaiAsPromised from 'chai-as-promised';
 
 import { TestUtils } from '../../../test-utils';
 import { Onions, SnodePool } from '../../../../session/apis/snode_api';
 import { Snode } from '../../../../data/data';
 
-import chaiAsPromised from 'chai-as-promised';
 import * as OnionPaths from '../../../../session/onions/onionPath';
 import {
   generateFakeSnodes,
@@ -17,6 +14,7 @@ import {
   stubData,
 } from '../../../test-utils/utils';
 import { SeedNodeAPI } from '../../../../session/apis/seed_node_api';
+
 chai.use(chaiAsPromised as any);
 chai.should();
 
@@ -33,9 +31,7 @@ const fakeSnodePool: Array<Snode> = [
   generateFakeSnodeWithEdKey(guard3ed),
   ...generateFakeSnodes(3),
 ];
-// tslint:disable: variable-name
 
-// tslint:disable-next-line: max-func-body-length
 describe('OnionPaths', () => {
   describe('getSnodePoolFromDBOrFetchFromSeed', () => {
     let getSnodePoolFromDb: sinon.SinonStub;
diff --git a/ts/test/session/unit/onion/hfHandling_test.ts b/ts/test/session/unit/onion/hfHandling_test.ts
index c0ae84c3d1..0c0bf1a326 100644
--- a/ts/test/session/unit/onion/hfHandling_test.ts
+++ b/ts/test/session/unit/onion/hfHandling_test.ts
@@ -8,7 +8,6 @@ import {
 } from '../../../../session/apis/snode_api/hfHandling';
 import { TestUtils } from '../../../test-utils';
 
-// tslint:disable-next-line: max-func-body-length
 describe('hardfork handling', () => {
   describe('getHasSeenHF190', () => {
     afterEach(() => {
@@ -142,7 +141,6 @@ describe('hardfork handling', () => {
     });
   });
 
-  // tslint:disable-next-line: max-func-body-length
   describe('handleHardforkResult', () => {
     afterEach(() => {
       Sinon.restore();
diff --git a/ts/test/session/unit/padding/Padding_test.ts b/ts/test/session/unit/padding/Padding_test.ts
index 6f3d583504..1577c364d0 100644
--- a/ts/test/session/unit/padding/Padding_test.ts
+++ b/ts/test/session/unit/padding/Padding_test.ts
@@ -1,5 +1,3 @@
-// tslint:disable: no-implicit-dependencies max-func-body-length no-unused-expression
-
 import chai from 'chai';
 import { describe } from 'mocha';
 
@@ -11,12 +9,12 @@ import {
   removeMessagePadding,
 } from '../../../../session/crypto/BufferPadding';
 import { MAX_ATTACHMENT_FILESIZE_BYTES } from '../../../../session/constants';
+
 chai.use(chaiAsPromised as any);
 chai.should();
 
 const { expect } = chai;
 
-// tslint:disable-next-line: max-func-body-length
 describe('Padding', () => {
   describe('Attachment padding', () => {
     it('add padding', () => {
@@ -32,7 +30,7 @@ describe('Padding', () => {
     });
 
     it('no padding if attachment has the max size', () => {
-      //if the attachment is already of the max size, we do not pad it more
+      // if the attachment is already of the max size, we do not pad it more
       const bufferIn = new Uint8Array(MAX_ATTACHMENT_FILESIZE_BYTES);
       const paddedBuffer = addAttachmentPadding(bufferIn);
       expect(paddedBuffer.byteLength).to.equal(MAX_ATTACHMENT_FILESIZE_BYTES);
@@ -57,7 +55,7 @@ describe('Padding', () => {
       const bufferIn = new Uint8Array(MAX_ATTACHMENT_FILESIZE_BYTES + 1);
       const paddedBuffer = addAttachmentPadding(bufferIn);
       const expectedPaddedSize = Math.floor(
-        Math.pow(1.05, Math.ceil(Math.log(bufferIn.length) / Math.log(1.05)))
+        1.05 ** Math.ceil(Math.log(bufferIn.length) / Math.log(1.05))
       );
       expect(new Uint8Array(paddedBuffer.slice(0, bufferIn.length))).to.equalBytes(bufferIn);
       // this makes sure that the padding is just the 0 bytes
diff --git a/ts/test/session/unit/privacy/Privacy_test.ts b/ts/test/session/unit/privacy/Privacy_test.ts
index 42c814ac7a..843ff2a081 100644
--- a/ts/test/session/unit/privacy/Privacy_test.ts
+++ b/ts/test/session/unit/privacy/Privacy_test.ts
@@ -1,5 +1,3 @@
-// tslint:disable: no-implicit-dependencies no-unused-expression no-http-string  max-func-body-length
-
 import chai, { expect } from 'chai';
 import { describe } from 'mocha';
 
@@ -7,6 +5,7 @@ import path from 'path';
 
 import chaiAsPromised from 'chai-as-promised';
 import { redactAll } from '../../../../util/privacy';
+
 chai.use(chaiAsPromised as any);
 describe('Privacy', () => {
   describe('Redact sessionID', () => {
diff --git a/ts/test/session/unit/reactions/ReactionMessage_test.ts b/ts/test/session/unit/reactions/ReactionMessage_test.ts
index 8961626d10..256a736586 100644
--- a/ts/test/session/unit/reactions/ReactionMessage_test.ts
+++ b/ts/test/session/unit/reactions/ReactionMessage_test.ts
@@ -1,15 +1,19 @@
+/* eslint-disable no-await-in-loop */
+/* eslint-disable no-unused-expressions */
 import chai, { expect } from 'chai';
 import Sinon, { useFakeTimers } from 'sinon';
+import { noop } from 'lodash';
+import chaiAsPromised from 'chai-as-promised';
+
 import { Reactions } from '../../../../util/reactions';
 import { Data } from '../../../../data/data';
 import * as Storage from '../../../../util/storage';
 import { generateFakeIncomingPrivateMessage, stubWindowLog } from '../../../test-utils/utils';
 import { DEFAULT_RECENT_REACTS } from '../../../../session/constants';
-import { noop } from 'lodash';
+
 import { UserUtils } from '../../../../session/utils';
 import { SignalService } from '../../../../protobuf';
 import { MessageCollection } from '../../../../models/message';
-import chaiAsPromised from 'chai-as-promised';
 
 chai.use(chaiAsPromised as any);
 
@@ -60,9 +64,9 @@ describe('ReactionMessage', () => {
 
     expect(updatedMessage?.get('reacts'), 'original message should have reacts').to.not.be
       .undefined;
-    // tslint:disable: no-non-null-assertion
+
     expect(updatedMessage?.get('reacts')!['😄'], 'reacts should have 😄 key').to.not.be.undefined;
-    // tslint:disable: no-non-null-assertion
+
     expect(
       updatedMessage!.get('reacts')!['😄'].senders[0],
       'sender pubkey should match'
diff --git a/ts/test/session/unit/receiver/opengroup/deduplicate_test.ts b/ts/test/session/unit/receiver/opengroup/deduplicate_test.ts
index ac7bd2ecdc..f8d8f5b0fa 100644
--- a/ts/test/session/unit/receiver/opengroup/deduplicate_test.ts
+++ b/ts/test/session/unit/receiver/opengroup/deduplicate_test.ts
@@ -1,5 +1,3 @@
-// tslint:disable: no-implicit-dependencies max-func-body-length no-unused-expression
-
 import chai from 'chai';
 import { describe } from 'mocha';
 import Sinon from 'sinon';
@@ -8,7 +6,6 @@ import { TestUtils } from '../../../../test-utils';
 
 const { expect } = chai;
 
-// tslint:disable-next-line: max-func-body-length
 describe('filterDuplicatesFromDbAndIncomingV4', () => {
   describe('filters already duplicated message in the same incoming batch', () => {
     beforeEach(() => {
diff --git a/ts/test/session/unit/receiving/ConfigurationMessage_test.ts b/ts/test/session/unit/receiving/ConfigurationMessage_test.ts
index 7a8e9f62f2..9466c1d3b8 100644
--- a/ts/test/session/unit/receiving/ConfigurationMessage_test.ts
+++ b/ts/test/session/unit/receiving/ConfigurationMessage_test.ts
@@ -1,21 +1,21 @@
-// tslint:disable: no-implicit-dependencies
-
 import chai from 'chai';
+import Sinon from 'sinon';
+import chaiAsPromised from 'chai-as-promised';
+
 import { SignalService } from '../../../../protobuf';
 
 import { ConfigurationMessage } from '../../../../session/messages/outgoing/controlMessage/ConfigurationMessage';
 import { UserUtils } from '../../../../session/utils';
 import { TestUtils } from '../../../test-utils';
 
-import Sinon from 'sinon';
 import * as cache from '../../../../receiver/cache';
 import { EnvelopePlus } from '../../../../receiver/types';
 
-import chaiAsPromised from 'chai-as-promised';
 import { ConfigMessageHandler } from '../../../../receiver/configMessage';
 import { ConfigurationSync } from '../../../../session/utils/job_runners/jobs/ConfigurationSyncJob';
 import { ReleasedFeatures } from '../../../../util/releaseFeature';
 import { stubData } from '../../../test-utils/utils';
+
 chai.use(chaiAsPromised as any);
 chai.should();
 
diff --git a/ts/test/session/unit/selectors/conversations_test.ts b/ts/test/session/unit/selectors/conversations_test.ts
index 96954ff96f..86ab970ee6 100644
--- a/ts/test/session/unit/selectors/conversations_test.ts
+++ b/ts/test/session/unit/selectors/conversations_test.ts
@@ -12,7 +12,6 @@ import {
 
 describe('state/selectors/conversations', () => {
   describe('#getSortedConversationsList', () => {
-    // tslint:disable-next-line: max-func-body-length
     it('sorts conversations based on timestamp then by intl-friendly title', () => {
       const i18n = (key: string) => key;
       const data: ConversationLookupType = {
@@ -145,7 +144,6 @@ describe('state/selectors/conversations', () => {
   });
 
   describe('#getSortedConversationsWithPinned', () => {
-    // tslint:disable-next-line: max-func-body-length
     it('sorts conversations based on pin, timestamp then by intl-friendly title', () => {
       const i18n = (key: string) => key;
       const data: ConversationLookupType = {
diff --git a/ts/test/session/unit/sending/MessageQueue_test.ts b/ts/test/session/unit/sending/MessageQueue_test.ts
index e074213427..70fa7816ca 100644
--- a/ts/test/session/unit/sending/MessageQueue_test.ts
+++ b/ts/test/session/unit/sending/MessageQueue_test.ts
@@ -1,12 +1,19 @@
-// tslint:disable: no-implicit-dependencies max-func-body-length no-unused-expression
-
+/* eslint-disable consistent-return */
+/* eslint-disable no-unused-expressions */
+/* eslint-disable more/no-then */
+/* eslint-disable no-loop-func */
+/* eslint-disable @typescript-eslint/no-floating-promises */
+/* eslint-disable no-await-in-loop */
+/* eslint-disable no-unreachable-loop */
+/* eslint-disable no-restricted-syntax */
 import chai from 'chai';
 import Sinon, * as sinon from 'sinon';
 import { describe } from 'mocha';
 import { randomBytes } from 'crypto';
+import chaiAsPromised from 'chai-as-promised';
 
 import { GroupUtils, PromiseUtils, UserUtils } from '../../../../session/utils';
-import { TestUtils } from '../../../../test/test-utils';
+import { TestUtils } from '../../../test-utils';
 import { MessageQueue } from '../../../../session/sending/MessageQueue';
 import { ContentMessage } from '../../../../session/messages/outgoing';
 import { PubKey, RawMessage } from '../../../../session/types';
@@ -14,7 +21,6 @@ import { MessageSender } from '../../../../session/sending';
 import { PendingMessageCacheStub } from '../../../test-utils/stubs';
 import { ClosedGroupMessage } from '../../../../session/messages/outgoing/controlMessage/group/ClosedGroupMessage';
 
-import chaiAsPromised from 'chai-as-promised';
 import { MessageSentHandler } from '../../../../session/sending/MessageSentHandler';
 import { stubData } from '../../../test-utils/utils';
 import { SnodeNamespaces } from '../../../../session/apis/snode_api/namespaces';
@@ -24,7 +30,6 @@ chai.should();
 
 const { expect } = chai;
 
-// tslint:disable-next-line: max-func-body-length
 describe('MessageQueue', () => {
   // Initialize new stubbed cache
   const ourDevice = TestUtils.generateFakePubKey();
diff --git a/ts/test/session/unit/sending/MessageSender_test.ts b/ts/test/session/unit/sending/MessageSender_test.ts
index 4626fae4d1..7cf526c65e 100644
--- a/ts/test/session/unit/sending/MessageSender_test.ts
+++ b/ts/test/session/unit/sending/MessageSender_test.ts
@@ -37,7 +37,6 @@ describe('MessageSender', () => {
     await getConversationController().load();
   });
 
-  // tslint:disable-next-line: max-func-body-length
   describe('send', () => {
     const ourNumber = '0123456789abcdef';
     let sessionMessageAPISendStub: sinon.SinonStub<any>;
@@ -309,7 +308,6 @@ describe('MessageSender', () => {
       });
       try {
         await MessageSender.sendToOpenGroupV2(message, roomInfos, false, []);
-        // tslint:disable-next-line: no-empty
       } catch (e) {}
       // we made the fourth call success, but we should not get there. We should stop at 3 the retries (1+2)
       expect(decodev4responseStub.calledThrice);
diff --git a/ts/test/session/unit/sending/PendingMessageCache_test.ts b/ts/test/session/unit/sending/PendingMessageCache_test.ts
index 4da6d7d282..caa0310208 100644
--- a/ts/test/session/unit/sending/PendingMessageCache_test.ts
+++ b/ts/test/session/unit/sending/PendingMessageCache_test.ts
@@ -1,9 +1,11 @@
-// tslint:disable: no-implicit-dependencies max-func-body-length no-unused-expression
+/* eslint-disable no-unused-expressions */
+/* eslint-disable no-await-in-loop */
+/* eslint-disable no-restricted-syntax */
 import { expect } from 'chai';
 import Sinon from 'sinon';
 import * as _ from 'lodash';
 import { MessageUtils } from '../../../../session/utils';
-import { TestUtils } from '../../../../test/test-utils';
+import { TestUtils } from '../../../test-utils';
 import { PendingMessageCache } from '../../../../session/sending/PendingMessageCache';
 import { SnodeNamespaces } from '../../../../session/apis/snode_api/namespaces';
 
diff --git a/ts/test/session/unit/sogsv3/ApiUtil_test.ts b/ts/test/session/unit/sogsv3/ApiUtil_test.ts
index 68f9464f17..d4e7c4cd2f 100644
--- a/ts/test/session/unit/sogsv3/ApiUtil_test.ts
+++ b/ts/test/session/unit/sogsv3/ApiUtil_test.ts
@@ -1,5 +1,4 @@
-// tslint:disable: chai-vague-errors no-unused-expression no-http-string max-func-body-length
-
+/* eslint-disable no-unused-expressions */
 import { expect } from 'chai';
 import Sinon from 'sinon';
 import { OpenGroupData, OpenGroupV2Room } from '../../../../data/opengroups';
diff --git a/ts/test/session/unit/sogsv3/FetchCapabilities_test.ts b/ts/test/session/unit/sogsv3/FetchCapabilities_test.ts
index 45d138d326..4600363bcc 100644
--- a/ts/test/session/unit/sogsv3/FetchCapabilities_test.ts
+++ b/ts/test/session/unit/sogsv3/FetchCapabilities_test.ts
@@ -1,11 +1,8 @@
-// tslint:disable: no-implicit-dependencies max-func-body-length no-unused-expression
 import { expect } from 'chai';
 import Sinon from 'sinon';
 import { parseCapabilities } from '../../../../session/apis/open_group_api/sogsv3/sogsV3Capabilities';
 import { getCapabilitiesFromBatch } from '../../../../session/apis/open_group_api/sogsv3/sogsCapabilities';
 
-// tslint:disable: chai-vague-errors
-
 describe('FetchCapabilities', () => {
   afterEach(() => {
     Sinon.restore();
diff --git a/ts/test/session/unit/sogsv3/MutationCache_test.ts b/ts/test/session/unit/sogsv3/MutationCache_test.ts
index dc46a7b08b..82f07f8969 100644
--- a/ts/test/session/unit/sogsv3/MutationCache_test.ts
+++ b/ts/test/session/unit/sogsv3/MutationCache_test.ts
@@ -1,3 +1,4 @@
+/* eslint-disable no-unused-expressions */
 import { expect } from 'chai';
 import Sinon from 'sinon';
 import {
@@ -14,7 +15,6 @@ import {
   OpenGroupMessageV4,
   OpenGroupReactionMessageV4,
 } from '../../../../session/apis/open_group_api/opengroupV2/OpenGroupServerPoller';
-// tslint:disable: chai-vague-errors
 
 describe('mutationCache', () => {
   TestUtils.stubWindowLog();
@@ -322,7 +322,7 @@ describe('mutationCache', () => {
         server: roomInfos.serverUrl,
         room: roomInfos.roomId,
         changeType: ChangeType.REACTIONS,
-        seqno: 301, //// greater than response messageResponse seqno should be processed
+        seqno: 301, // greater than response messageResponse seqno should be processed
         metadata: {
           messageId: originalMessage.serverId,
           emoji: '😈',
diff --git a/ts/test/session/unit/sogsv3/knownBlindedKeys_test.ts b/ts/test/session/unit/sogsv3/knownBlindedKeys_test.ts
index 022848ae79..7beeed054e 100644
--- a/ts/test/session/unit/sogsv3/knownBlindedKeys_test.ts
+++ b/ts/test/session/unit/sogsv3/knownBlindedKeys_test.ts
@@ -1,4 +1,4 @@
-// tslint:disable: no-implicit-dependencies max-func-body-length no-unused-expression
+/* eslint-disable no-unused-expressions */
 import { expect } from 'chai';
 import Sinon from 'sinon';
 import { KNOWN_BLINDED_KEYS_ITEM } from '../../../../data/settings-key';
@@ -25,8 +25,6 @@ import { UserUtils } from '../../../../session/utils';
 import { expectAsyncToThrow, stubData, stubWindowLog } from '../../../test-utils/utils';
 import { TestUtils } from '../../../test-utils';
 
-// tslint:disable: chai-vague-errors
-
 const serverPublicKey = 'serverPublicKey';
 const blindedId = '151111';
 const blindedId2 = '152222';
diff --git a/ts/test/session/unit/swarm_polling/SwarmPolling_test.ts b/ts/test/session/unit/swarm_polling/SwarmPolling_test.ts
index 06a56bc2f3..4af38c1fbf 100644
--- a/ts/test/session/unit/swarm_polling/SwarmPolling_test.ts
+++ b/ts/test/session/unit/swarm_polling/SwarmPolling_test.ts
@@ -1,5 +1,3 @@
-// tslint:disable: no-implicit-dependencies max-func-body-length no-unused-expression
-
 import chai from 'chai';
 import { describe } from 'mocha';
 import Sinon, * as sinon from 'sinon';
@@ -20,20 +18,17 @@ import { sleepFor } from '../../../../session/utils/Promise';
 import { UserGroupsWrapperActions } from '../../../../webworker/workers/browser/libsession_worker_interface';
 import { TestUtils } from '../../../test-utils';
 import { generateFakeSnodes, stubData } from '../../../test-utils/utils';
-// tslint:disable: chai-vague-errors
 
 chai.use(chaiAsPromised as any);
 chai.should();
 
 const { expect } = chai;
 
-// tslint:disable-next-line: max-func-body-length
 describe('SwarmPolling', () => {
   // Initialize new stubbed cache
   const ourPubkey = TestUtils.generateFakePubKey();
   const ourNumber = ourPubkey.key;
 
-  // tslint:disable-next-line: variable-name
   let pollOnceForKeySpy: Sinon.SinonSpy<any>;
 
   let swarmPolling: SwarmPolling;
diff --git a/ts/test/session/unit/updater/updater_test.ts b/ts/test/session/unit/updater/updater_test.ts
index 1ac6c8a487..232c2106bc 100644
--- a/ts/test/session/unit/updater/updater_test.ts
+++ b/ts/test/session/unit/updater/updater_test.ts
@@ -3,7 +3,6 @@ import { isEmpty } from 'lodash';
 import path from 'path';
 
 describe('Updater', () => {
-  // tslint:disable-next-line: no-empty
   it.skip('isUpdateAvailable', () => {});
 
   it('package.json target are correct', () => {
diff --git a/ts/test/session/unit/utils/JobQueue_test.ts b/ts/test/session/unit/utils/JobQueue_test.ts
index 575592ffff..3b91c738c8 100644
--- a/ts/test/session/unit/utils/JobQueue_test.ts
+++ b/ts/test/session/unit/utils/JobQueue_test.ts
@@ -1,11 +1,10 @@
-// tslint:disable: no-implicit-dependencies max-func-body-length no-unused-expression
-
 import chai from 'chai';
 import { v4 as uuid } from 'uuid';
+import chaiAsPromised from 'chai-as-promised';
+
 import { JobQueue } from '../../../../session/utils/JobQueue';
 import { TestUtils } from '../../../test-utils';
 
-import chaiAsPromised from 'chai-as-promised';
 chai.use(chaiAsPromised as any);
 
 const { assert } = chai;
diff --git a/ts/test/session/unit/utils/Messages_test.ts b/ts/test/session/unit/utils/Messages_test.ts
index 0f3d349132..7b9a6bd745 100644
--- a/ts/test/session/unit/utils/Messages_test.ts
+++ b/ts/test/session/unit/utils/Messages_test.ts
@@ -1,15 +1,15 @@
-// tslint:disable: no-implicit-dependencies
-
+/* eslint-disable no-unused-expressions */
 import chai from 'chai';
+import chaiAsPromised from 'chai-as-promised';
+import { beforeEach } from 'mocha';
+import Sinon from 'sinon';
+
 import { ConfigurationMessage } from '../../../../session/messages/outgoing/controlMessage/ConfigurationMessage';
 import { ClosedGroupVisibleMessage } from '../../../../session/messages/outgoing/visibleMessage/ClosedGroupVisibleMessage';
 import { PubKey } from '../../../../session/types';
 import { MessageUtils, UserUtils } from '../../../../session/utils';
 import { TestUtils } from '../../../test-utils';
 
-import chaiAsPromised from 'chai-as-promised';
-import { beforeEach } from 'mocha';
-import Sinon from 'sinon';
 import { OpenGroupData, OpenGroupV2Room } from '../../../../data/opengroups';
 import { ConversationTypeEnum } from '../../../../models/conversationAttributes';
 import { SignalService } from '../../../../protobuf';
@@ -24,17 +24,16 @@ import { ClosedGroupNewMessage } from '../../../../session/messages/outgoing/con
 import { ClosedGroupRemovedMembersMessage } from '../../../../session/messages/outgoing/controlMessage/group/ClosedGroupRemovedMembersMessage';
 import { getCurrentConfigurationMessage } from '../../../../session/utils/sync/syncUtils';
 import { stubData, stubOpenGroupData } from '../../../test-utils/utils';
+
 chai.use(chaiAsPromised as any);
 
 const { expect } = chai;
-// tslint:disable: no-implicit-dependencies no-unused-expression no-http-string  max-func-body-length
 
 describe('Message Utils', () => {
   afterEach(() => {
     Sinon.restore();
   });
 
-  // tslint:disable-next-line: max-func-body-length
   describe('toRawMessage', () => {
     it('can convert to raw message', async () => {
       const device = TestUtils.generateFakePubKey();
@@ -48,15 +47,12 @@ describe('Message Utils', () => {
 
       expect(Object.keys(rawMessage)).to.have.length(6);
 
-      // do not believe tslint. those calls to.exist are actually correct here
-      // tslint:disable: no-unused-expression
       expect(rawMessage.identifier).to.exist;
       expect(rawMessage.namespace).to.exist;
       expect(rawMessage.device).to.exist;
       expect(rawMessage.encryption).to.exist;
       expect(rawMessage.plainTextBuffer).to.exist;
       expect(rawMessage.ttl).to.exist;
-      // tslint:enable: no-unused-expression
 
       expect(rawMessage.identifier).to.equal(message.identifier);
       expect(rawMessage.device).to.equal(device.key);
@@ -313,11 +309,10 @@ describe('Message Utils', () => {
       );
       const convos = getConversationController().getConversations();
 
-      //convoID3 is active but 4 and 5 are not
+      // convoID3 is active but 4 and 5 are not
       const configMessage = await getCurrentConfigurationMessage(convos);
       expect(configMessage.activeOpenGroups.length).to.equal(1);
       expect(configMessage.activeOpenGroups[0]).to.equal(
-        // tslint:disable-next-line: no-http-string
         'http://chat-dev2.lokinet.org/fish?public_key=serverPublicKey'
       );
     });
diff --git a/ts/test/session/unit/utils/OpenGroupUtils_test.ts b/ts/test/session/unit/utils/OpenGroupUtils_test.ts
index ecd6b507ee..a86cd4b744 100644
--- a/ts/test/session/unit/utils/OpenGroupUtils_test.ts
+++ b/ts/test/session/unit/utils/OpenGroupUtils_test.ts
@@ -1,5 +1,3 @@
-// tslint:disable: no-implicit-dependencies max-func-body-length no-unused-expression
-
 import chai, { expect } from 'chai';
 
 import chaiAsPromised from 'chai-as-promised';
@@ -8,9 +6,9 @@ import {
   getOpenGroupV2ConversationId,
   prefixify,
 } from '../../../../session/apis/open_group_api/utils/OpenGroupUtils';
+
 chai.use(chaiAsPromised as any);
 
-// tslint:disable: no-http-string
 describe('OpenGroupUtils', () => {
   describe('prefixify', () => {
     it('should just return if http:// is as prefix', () => {
diff --git a/ts/test/session/unit/utils/Promise_test.ts b/ts/test/session/unit/utils/Promise_test.ts
index 2673fc0ed3..075ebc260f 100644
--- a/ts/test/session/unit/utils/Promise_test.ts
+++ b/ts/test/session/unit/utils/Promise_test.ts
@@ -1,12 +1,9 @@
-// tslint:disable: no-implicit-dependencies max-func-body-length no-unused-expression
-
 import chai from 'chai';
 import Sinon, * as sinon from 'sinon';
+import chaiAsPromised from 'chai-as-promised';
 
 import { PromiseUtils } from '../../../../session/utils';
 
-// tslint:disable-next-line: no-require-imports no-var-requires
-import chaiAsPromised from 'chai-as-promised';
 import {
   allowOnlyOneAtATime,
   hasAlreadyOneAtaTimeMatching,
@@ -53,7 +50,6 @@ describe('Promise Utils', () => {
       // completionSpy will be called on done
       const completionSpy = Sinon.spy();
 
-      // tslint:disable-next-line: mocha-unneeded-done
       const task = (done: any) => {
         completionSpy();
         done();
@@ -106,7 +102,6 @@ describe('Promise Utils', () => {
       // completionSpy will be called on done
       const completionSpy = Sinon.spy();
 
-      // tslint:disable-next-line: mocha-unneeded-done
       const task = (done: any) => {
         completionSpy();
         done();
@@ -177,7 +172,6 @@ describe('Promise Utils', () => {
         await allowOnlyOneAtATime('testing', spy, 5);
         throw new Error('should not get here');
       } catch (e) {
-        // tslint:disable-next-line: no-console
         console.error(e);
         expect(e).to.be.be.eql(undefined, 'should be undefined');
       }
@@ -218,6 +212,6 @@ describe('Promise Utils', () => {
     expect(
       enableLogRedirect,
       'If you see this message, just set `enableLogRedirect` to false in `ts/test/test-utils/utils/stubbing.ts`'
-    ).to.be.false;
+    ).to.be.eq(false);
   });
 });
diff --git a/ts/test/session/unit/utils/RingBuffer_test.ts b/ts/test/session/unit/utils/RingBuffer_test.ts
index add8aa7120..684506d3ce 100644
--- a/ts/test/session/unit/utils/RingBuffer_test.ts
+++ b/ts/test/session/unit/utils/RingBuffer_test.ts
@@ -1,5 +1,3 @@
-// tslint:disable: no-implicit-dependencies max-func-body-length no-unused-expression no-require-imports no-var-requires
-
 import chai from 'chai';
 import { RingBuffer } from '../../../../session/utils/RingBuffer';
 
diff --git a/ts/test/session/unit/utils/String_test.ts b/ts/test/session/unit/utils/String_test.ts
index b814e614fe..4813618fb8 100644
--- a/ts/test/session/unit/utils/String_test.ts
+++ b/ts/test/session/unit/utils/String_test.ts
@@ -1,12 +1,12 @@
-// tslint:disable: no-implicit-dependencies max-func-body-length no-unused-expression
+/* eslint-disable no-unused-expressions */
 import chai from 'chai';
 import ByteBuffer from 'bytebuffer';
+import chaiAsPromised from 'chai-as-promised';
 
 // Can't import type as StringUtils.Encoding
 import { Encoding } from '../../../../session/utils/String';
 import { StringUtils } from '../../../../session/utils';
 
-import chaiAsPromised from 'chai-as-promised';
 chai.use(chaiAsPromised as any);
 
 const { expect } = chai;
@@ -82,7 +82,7 @@ describe('String Utils', () => {
     });
 
     it('can encode huge string', () => {
-      const stringSize = Math.pow(2, 16);
+      const stringSize = 2 ** 16;
       const testString = Array(stringSize)
         .fill('0')
         .join('');
@@ -137,14 +137,14 @@ describe('String Utils', () => {
       encodings.forEach(encoding => {
         const decoded = StringUtils.decode(buffer, encoding);
 
-        expect(decoded).to.exist;
-        expect(typeof decoded === String.name.toLowerCase());
+        expect(decoded.length).to.exist;
+        expect(typeof decoded === 'string');
         expect(decoded).to.have.length(0);
       });
     });
 
     it('can decode huge buffer', () => {
-      const bytes = Math.pow(2, 16);
+      const bytes = 2 ** 16;
       const bufferString = Array(bytes)
         .fill('A')
         .join('');
@@ -156,8 +156,8 @@ describe('String Utils', () => {
       encodings.forEach(encoding => {
         const decoded = StringUtils.decode(buffer, encoding);
 
-        expect(decoded).to.exist;
-        expect(typeof decoded === String.name.toLowerCase());
+        expect(decoded.length).to.exist;
+        expect(typeof decoded === 'string');
         expect(decoded).to.have.length.greaterThan(0);
       });
     });
@@ -171,8 +171,8 @@ describe('String Utils', () => {
       encodings.forEach(encoding => {
         const decoded = StringUtils.decode(buffer, encoding);
 
-        expect(decoded).to.exist;
-        expect(typeof decoded === String.name.toLowerCase());
+        expect(decoded.length).to.exist;
+        expect(typeof decoded === 'string');
         expect(decoded).to.have.length.greaterThan(0);
       });
     });
@@ -188,8 +188,8 @@ describe('String Utils', () => {
       encodings.forEach(encoding => {
         const decoded = StringUtils.decode(buffer, encoding);
 
-        expect(decoded).to.exist;
-        expect(typeof decoded === String.name.toLowerCase());
+        expect(decoded.length).to.exist;
+        expect(typeof decoded === 'string');
         expect(decoded).to.have.length.greaterThan(0);
       });
     });
@@ -203,8 +203,8 @@ describe('String Utils', () => {
       encodings.forEach(encoding => {
         const decoded = StringUtils.decode(buffer, encoding);
 
-        expect(decoded).to.exist;
-        expect(typeof decoded === String.name.toLowerCase());
+        expect(decoded.length).to.exist;
+        expect(typeof decoded === 'string');
         expect(decoded).to.have.length.greaterThan(0);
       });
     });
@@ -218,8 +218,8 @@ describe('String Utils', () => {
       encodings.forEach(encoding => {
         const decoded = StringUtils.decode(buffer, encoding);
 
-        expect(decoded).to.exist;
-        expect(typeof decoded === String.name.toLowerCase());
+        expect(decoded.length).to.exist;
+        expect(typeof decoded === 'string');
         expect(decoded).to.have.length.greaterThan(0);
       });
     });
diff --git a/ts/test/session/unit/utils/TaskWithTimeout_test.ts b/ts/test/session/unit/utils/TaskWithTimeout_test.ts
index 4f1e86a4dd..52e70bfda7 100644
--- a/ts/test/session/unit/utils/TaskWithTimeout_test.ts
+++ b/ts/test/session/unit/utils/TaskWithTimeout_test.ts
@@ -1,10 +1,9 @@
-// tslint:disable: no-implicit-dependencies max-func-body-length no-unused-expression
-
+/* eslint-disable more/no-then */
 import chai from 'chai';
-
-// tslint:disable-next-line: no-require-imports no-var-requires
 import chaiAsPromised from 'chai-as-promised';
+
 import { createTaskWithTimeout } from '../../../../session/utils/TaskWithTimeout';
+
 chai.use(chaiAsPromised as any);
 chai.should();
 
@@ -51,7 +50,6 @@ describe('createTaskWithTimeout', () => {
     );
   });
   it('resolves if task returns something falsey', async () => {
-    // tslint:disable-next-line: no-empty
     const task = () => {};
     const taskWithTimeout = createTaskWithTimeout(task, taskName);
     await taskWithTimeout();
diff --git a/ts/test/session/unit/utils/job_runner/JobRunner_test.ts b/ts/test/session/unit/utils/job_runner/JobRunner_test.ts
index 675fb04d13..121358a0d5 100644
--- a/ts/test/session/unit/utils/job_runner/JobRunner_test.ts
+++ b/ts/test/session/unit/utils/job_runner/JobRunner_test.ts
@@ -1,5 +1,5 @@
 import { expect } from 'chai';
-import _, { isUndefined } from 'lodash';
+import { isUndefined } from 'lodash';
 import Sinon from 'sinon';
 import { v4 } from 'uuid';
 import { PersistedJobRunner } from '../../../../../session/utils/job_runners/JobRunner';
@@ -11,7 +11,6 @@ import {
 import { sleepFor } from '../../../../../session/utils/Promise';
 import { stubData } from '../../../../test-utils/utils';
 import { TestUtils } from '../../../../test-utils';
-// tslint:disable: no-console
 
 function getFakeSleepForJob(timestamp: number): FakeSleepForJob {
   const job = new FakeSleepForJob({
@@ -47,7 +46,6 @@ function getFakeSleepForMultiJob({
   return job;
 }
 
-// tslint:disable-next-line: max-func-body-length
 describe('JobRunner', () => {
   let getItemById: Sinon.SinonStub;
   let clock: Sinon.SinonFakeTimers;
@@ -337,7 +335,9 @@ describe('JobRunner', () => {
     it('does not await if no job at all ', async () => {
       await runner.loadJobsFromDb();
       runner.startProcessing();
-      expect(runner.stopAndWaitCurrentJob()).to.be.eventually.eq('no_await');
+      const ret = await runner.stopAndWaitCurrentJob();
+
+      expect(ret).to.be.eq('no_await');
     });
 
     it('does not await if there are jobs but none are started', async () => {
@@ -346,7 +346,9 @@ describe('JobRunner', () => {
       const job = getFakeSleepForJob(150);
       await runner.addJob(job);
       expect(runner.startProcessing()).to.be.eq('job_deferred');
-      expect(runner.stopAndWaitCurrentJob()).to.be.eventually.eq('no_await');
+      const ret = await runner.stopAndWaitCurrentJob();
+
+      expect(ret).to.be.eq('no_await');
     });
 
     it('does await if there are jobs and one is started', async () => {
@@ -356,8 +358,9 @@ describe('JobRunner', () => {
       await runner.addJob(job);
       expect(runner.startProcessing()).to.be.eq('job_started');
       clock.tick(5000);
+      const ret = await runner.stopAndWaitCurrentJob();
 
-      expect(runner.stopAndWaitCurrentJob()).to.be.eventually.eq('await');
+      expect(ret).to.be.eq('await');
     });
   });
 
@@ -365,7 +368,8 @@ describe('JobRunner', () => {
     it('does not await if no job at all ', async () => {
       await runner.loadJobsFromDb();
       runner.startProcessing();
-      expect(runner.stopAndWaitCurrentJob()).to.be.eventually.eq('no_await');
+      const ret = await runner.stopAndWaitCurrentJob();
+      expect(ret).to.be.eq('no_await');
     });
 
     it('does not await if there are jobs but none are started', async () => {
@@ -374,7 +378,9 @@ describe('JobRunner', () => {
       const job = getFakeSleepForJob(150);
       await runner.addJob(job);
       expect(runner.startProcessing()).to.be.eq('job_deferred');
-      expect(runner.stopAndWaitCurrentJob()).to.be.eventually.eq('no_await');
+      const ret = await runner.stopAndWaitCurrentJob();
+
+      expect(ret).to.be.eq('no_await');
     });
 
     it('does await if there are jobs and one is started', async () => {
diff --git a/ts/test/test-utils/stubs/sending/PendingMessageCacheStub.ts b/ts/test/test-utils/stubs/sending/PendingMessageCacheStub.ts
index fa1fc5129d..b1a468298a 100644
--- a/ts/test/test-utils/stubs/sending/PendingMessageCacheStub.ts
+++ b/ts/test/test-utils/stubs/sending/PendingMessageCacheStub.ts
@@ -16,7 +16,6 @@ export class PendingMessageCacheStub extends PendingMessageCache {
     return this.dbData;
   }
 
-  protected async saveToDB() {
-    return;
-  }
+  // eslint-disable-next-line  no-empty-function
+  protected async saveToDB() {}
 }
diff --git a/ts/test/test-utils/utils/envelope.ts b/ts/test/test-utils/utils/envelope.ts
index 100bb620bb..0a36e329aa 100644
--- a/ts/test/test-utils/utils/envelope.ts
+++ b/ts/test/test-utils/utils/envelope.ts
@@ -1,7 +1,6 @@
-import { EnvelopePlus } from '../../../receiver/types';
-import { SignalService } from '../../../protobuf';
-
 import { v4 as uuidv4 } from 'uuid';
+import { SignalService } from '../../../protobuf';
+import { EnvelopePlus } from '../../../receiver/types';
 
 export function generateEnvelopePlusClosedGroup(groupId: string, sender: string): EnvelopePlus {
   const envelope: EnvelopePlus = {
diff --git a/ts/test/test-utils/utils/message.ts b/ts/test/test-utils/utils/message.ts
index 3afba778d5..9fd9f02755 100644
--- a/ts/test/test-utils/utils/message.ts
+++ b/ts/test/test-utils/utils/message.ts
@@ -45,7 +45,7 @@ export function generateOpenGroupMessageV4(): OpenGroupMessageV4 {
     reactions: {},
     seqno: 0,
     session_id: TestUtils.generateFakePubKey().key,
-    // tslint:disable-next-line: insecure-random
+
     id: Math.floor(Math.random() * 100000),
     data: 'whatever',
   };
@@ -75,7 +75,6 @@ export function generateOpenGroupVisibleMessage(): OpenGroupVisibleMessage {
 }
 
 export function generateOpenGroupV2RoomInfos(): OpenGroupRequestCommonType {
-  // tslint:disable-next-line: no-http-string
   return { roomId: 'main', serverUrl: 'http://open.getsession.org' };
 }
 
diff --git a/ts/test/test-utils/utils/pubkey.ts b/ts/test/test-utils/utils/pubkey.ts
index 9c9cefb269..617473ce26 100644
--- a/ts/test/test-utils/utils/pubkey.ts
+++ b/ts/test/test-utils/utils/pubkey.ts
@@ -40,13 +40,11 @@ export function generateFakeECKeyPair(): ECKeyPair {
 export function generateFakePubKeys(amount: number): Array<PubKey> {
   const numPubKeys = amount > 0 ? Math.floor(amount) : 0;
 
-  // tslint:disable-next-line: no-unnecessary-callback-wrapper
   return new Array(numPubKeys).fill(0).map(() => generateFakePubKey());
 }
 
 export function generateFakeSnode(): Snode {
   return {
-    // tslint:disable: insecure-random
     ip: `136.243.${Math.random() * 255}.${Math.random() * 255}`,
     port: 22116,
     pubkey_x25519: generateFakePubKeyStr(),
diff --git a/ts/test/test-utils/utils/stubbing.ts b/ts/test/test-utils/utils/stubbing.ts
index 8ff01faf8e..20eb343a7a 100644
--- a/ts/test/test-utils/utils/stubbing.ts
+++ b/ts/test/test-utils/utils/stubbing.ts
@@ -1,6 +1,7 @@
+/* eslint-disable func-names */
 import { expect } from 'chai';
 import Sinon from 'sinon';
-import { Data } from '../../../../ts/data/data';
+import { Data } from '../../../data/data';
 import { OpenGroupData } from '../../../data/opengroups';
 import { ConfigDumpData } from '../../../data/configDump/configDump';
 
@@ -11,7 +12,7 @@ const globalAny: any = global;
 
 // We have to do this in a weird way because Data uses module.exports
 //  which doesn't play well with sinon or ImportMock
-// tslint:disable: no-require-imports no-var-requires
+
 type DataFunction = typeof Data;
 type OpenGroupDataFunction = typeof OpenGroupData;
 type ConfigDumpDataFunction = typeof ConfigDumpData;
@@ -45,10 +46,8 @@ export function stubLibSessionWorker(value: any) {
 }
 
 export function stubCreateObjectUrl() {
-  // tslint:disable-next-line: no-empty no-function-expression
   (global as any).URL = function() {};
   (global as any).URL.createObjectURL = () => {
-    // tslint:disable-next-line: insecure-random
     return `${Date.now()}:${Math.floor(Math.random() * 1000)}`;
   };
 }
@@ -59,7 +58,6 @@ type WindowValue<K extends keyof Window> = Partial<Window[K]> | undefined;
  * Stub a window object
  */
 export function stubWindow<K extends keyof Window>(fn: K, value: WindowValue<K>) {
-  // tslint:disable-next-line: no-typeof-undefined
   if (typeof globalAny.window === 'undefined') {
     globalAny.window = {};
   }
@@ -84,7 +82,6 @@ export const enableLogRedirect = false;
 
 export const stubWindowLog = () => {
   stubWindow('log', {
-    // tslint:disable: no-void-expression no-console
     info: (...args: any) => (enableLogRedirect ? console.info(...args) : {}),
     warn: (...args: any) => (enableLogRedirect ? console.warn(...args) : {}),
     error: (...args: any) => (enableLogRedirect ? console.error(...args) : {}),
diff --git a/ts/test/test-utils/utils/timeout.ts b/ts/test/test-utils/utils/timeout.ts
index cafd9cf55d..f052e4d9fb 100644
--- a/ts/test/test-utils/utils/timeout.ts
+++ b/ts/test/test-utils/utils/timeout.ts
@@ -1,4 +1,5 @@
 export async function timeout(ms: number): Promise<void> {
-  // tslint:disable-next-line no-string-based-set-timeout
-  return new Promise(resolve => setTimeout(resolve, ms));
+  return new Promise(resolve => {
+    setTimeout(resolve, ms);
+  });
 }
diff --git a/ts/test/tslint.json b/ts/test/tslint.json
deleted file mode 100644
index ebe01b7f13..0000000000
--- a/ts/test/tslint.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "defaultSeverity": "error",
-  "extends": ["../../tslint.json"],
-  "rules": {
-    "no-implicit-dependencies": false,
-    "max-func-body-length": false,
-    "no-unused-expression": false,
-    "no-unused-variable": false,
-    "await-promise": [true, "PromiseLike"],
-    "no-floating-promises": [true, "PromiseLike"]
-  }
-}
diff --git a/ts/test/types/Attachment_test.ts b/ts/test/types/Attachment_test.ts
index b7a5b6a2e6..4542782b12 100644
--- a/ts/test/types/Attachment_test.ts
+++ b/ts/test/types/Attachment_test.ts
@@ -17,7 +17,6 @@ const stringToArrayBuffer = (str: string) => {
   return array.buffer;
 };
 
-// tslint:disable-next-line: max-func-body-length
 describe('Attachment', () => {
   describe('getFileExtension', () => {
     it('should return file extension from content type', () => {
diff --git a/ts/test/types/Settings_test.ts b/ts/test/types/Settings_test.ts
index 609617bc7c..a8c981db25 100644
--- a/ts/test/types/Settings_test.ts
+++ b/ts/test/types/Settings_test.ts
@@ -2,9 +2,8 @@ import os from 'os';
 import Sinon from 'sinon';
 import { assert } from 'chai';
 
-import * as Settings from '../../../ts/types/Settings';
+import * as Settings from '../../types/Settings';
 
-// tslint:disable-next-line: max-func-body-length
 describe('Settings', () => {
   describe('isAudioNotificationSupported', () => {
     context('on macOS', () => {
diff --git a/ts/test/types/initializeAttachmentMetadata_test.ts b/ts/test/types/initializeAttachmentMetadata_test.ts
index e8c126370b..f0dd1a6018 100644
--- a/ts/test/types/initializeAttachmentMetadata_test.ts
+++ b/ts/test/types/initializeAttachmentMetadata_test.ts
@@ -6,9 +6,7 @@ import {
   hasVisualMediaAttachmentInMessage,
 } from '../../types/message/initializeAttachmentMetadata';
 import { generateFakeIncomingPrivateMessage, stubWindowLog } from '../test-utils/utils';
-// tslint:disable: chai-vague-errors no-unused-expression
 
-// tslint:disable-next-line: max-func-body-length
 describe('initializeAttachmentMetadata', () => {
   beforeEach(() => {
     stubWindowLog();
@@ -23,61 +21,61 @@ describe('initializeAttachmentMetadata', () => {
     it('empty list attachments should return false', () => {
       const msgModel = generateFakeIncomingPrivateMessage();
       msgModel.set({ attachments: [] });
-      expect(hasFileAttachmentInMessage(msgModel)).to.be.false;
+      expect(hasFileAttachmentInMessage(msgModel)).to.be.eq(false);
     });
 
     it('first attachment has undefined content type should return false', () => {
       const msgModel = generateFakeIncomingPrivateMessage();
       msgModel.set({ attachments: [{ contentType: undefined }] });
-      expect(hasFileAttachmentInMessage(msgModel)).to.be.false;
+      expect(hasFileAttachmentInMessage(msgModel)).to.be.eq(false);
     });
 
     it('first attachment has null content type should return true', () => {
       const msgModel = generateFakeIncomingPrivateMessage();
       msgModel.set({ attachments: [{ contentType: null }] });
-      expect(hasFileAttachmentInMessage(msgModel)).to.be.true;
+      expect(hasFileAttachmentInMessage(msgModel)).to.be.eq(true);
     });
 
     it('first attachment is gif should return false', () => {
       const msgModel = generateFakeIncomingPrivateMessage();
       msgModel.set({ attachments: [{ contentType: 'image/gif' }] });
-      expect(hasFileAttachmentInMessage(msgModel)).to.be.false;
+      expect(hasFileAttachmentInMessage(msgModel)).to.be.eq(false);
     });
 
     it('first attachment is gif should return false', () => {
       const msgModel = generateFakeIncomingPrivateMessage();
       msgModel.set({ attachments: [{ contentType: 'image/gif' }] });
-      expect(hasFileAttachmentInMessage(msgModel)).to.be.false;
+      expect(hasFileAttachmentInMessage(msgModel)).to.be.eq(false);
     });
 
     it('first attachment is jpeg should return false', () => {
       const msgModel = generateFakeIncomingPrivateMessage();
       msgModel.set({ attachments: [{ contentType: 'image/jpeg' }] });
-      expect(hasFileAttachmentInMessage(msgModel)).to.be.false;
+      expect(hasFileAttachmentInMessage(msgModel)).to.be.eq(false);
     });
 
     it('first attachment is png should return false', () => {
       const msgModel = generateFakeIncomingPrivateMessage();
       msgModel.set({ attachments: [{ contentType: 'image/png' }] });
-      expect(hasFileAttachmentInMessage(msgModel)).to.be.false;
+      expect(hasFileAttachmentInMessage(msgModel)).to.be.eq(false);
     });
 
     it('first attachment is JPG should return false', () => {
       const msgModel = generateFakeIncomingPrivateMessage();
       msgModel.set({ attachments: [{ contentType: 'image/JPG' }] });
-      expect(hasFileAttachmentInMessage(msgModel)).to.be.false;
+      expect(hasFileAttachmentInMessage(msgModel)).to.be.eq(false);
     });
 
     it('first attachment is PNG should return false', () => {
       const msgModel = generateFakeIncomingPrivateMessage();
       msgModel.set({ attachments: [{ contentType: 'image/PNG' }] });
-      expect(hasFileAttachmentInMessage(msgModel)).to.be.false;
+      expect(hasFileAttachmentInMessage(msgModel)).to.be.eq(false);
     });
 
     it('first attachment is audio should return false', () => {
       const msgModel = generateFakeIncomingPrivateMessage();
       msgModel.set({ attachments: [{ contentType: 'audio/mp3' }] });
-      expect(hasFileAttachmentInMessage(msgModel)).to.be.false;
+      expect(hasFileAttachmentInMessage(msgModel)).to.be.eq(false);
     });
 
     it('first attachment is flagged as voice message should return false', () => {
@@ -87,7 +85,7 @@ describe('initializeAttachmentMetadata', () => {
           { contentType: 'audio/mp3', flags: SignalService.AttachmentPointer.Flags.VOICE_MESSAGE },
         ],
       });
-      expect(hasFileAttachmentInMessage(msgModel)).to.be.false;
+      expect(hasFileAttachmentInMessage(msgModel)).to.be.eq(false);
     });
 
     it('first attachment is flagged as voice message but no content type is false', () => {
@@ -97,13 +95,13 @@ describe('initializeAttachmentMetadata', () => {
           { contentType: undefined, flags: SignalService.AttachmentPointer.Flags.VOICE_MESSAGE },
         ],
       });
-      expect(hasFileAttachmentInMessage(msgModel)).to.be.false;
+      expect(hasFileAttachmentInMessage(msgModel)).to.be.eq(false);
     });
 
     it('first attachment content type is audio and other is null should return true', () => {
       const msgModel = generateFakeIncomingPrivateMessage();
       msgModel.set({ attachments: [{ contentType: 'audio/mp3' }, { contentType: null }] });
-      expect(hasFileAttachmentInMessage(msgModel)).to.be.true;
+      expect(hasFileAttachmentInMessage(msgModel)).to.be.eq(true);
     });
 
     it('first attachment content type is audio and other is null should return true', () => {
@@ -111,7 +109,7 @@ describe('initializeAttachmentMetadata', () => {
       msgModel.set({
         attachments: [{ contentType: 'audio/mp3' }, { contentType: 'file/whatever' }],
       });
-      expect(hasFileAttachmentInMessage(msgModel)).to.be.true;
+      expect(hasFileAttachmentInMessage(msgModel)).to.be.eq(true);
     });
   });
 
@@ -119,7 +117,7 @@ describe('initializeAttachmentMetadata', () => {
     it('no attachments should return false', () => {
       const msgModel = generateFakeIncomingPrivateMessage();
 
-      expect(hasVisualMediaAttachmentInMessage(msgModel)).to.be.false;
+      expect(hasVisualMediaAttachmentInMessage(msgModel)).to.be.eq(false);
     });
 
     it('empty attachments list should return false', () => {
@@ -127,7 +125,7 @@ describe('initializeAttachmentMetadata', () => {
       msgModel.set({
         attachments: [],
       });
-      expect(hasVisualMediaAttachmentInMessage(msgModel)).to.be.false;
+      expect(hasVisualMediaAttachmentInMessage(msgModel)).to.be.eq(false);
     });
 
     it('first attachment type is undefined should return false', () => {
@@ -135,7 +133,7 @@ describe('initializeAttachmentMetadata', () => {
       msgModel.set({
         attachments: [{ contentType: undefined }],
       });
-      expect(hasVisualMediaAttachmentInMessage(msgModel)).to.be.false;
+      expect(hasVisualMediaAttachmentInMessage(msgModel)).to.be.eq(false);
     });
 
     it('first attachment type is null should return false', () => {
@@ -143,7 +141,7 @@ describe('initializeAttachmentMetadata', () => {
       msgModel.set({
         attachments: [{ contentType: null }],
       });
-      expect(hasVisualMediaAttachmentInMessage(msgModel)).to.be.false;
+      expect(hasVisualMediaAttachmentInMessage(msgModel)).to.be.eq(false);
     });
 
     it('first attachment type is image/whatever should return true', () => {
@@ -151,7 +149,7 @@ describe('initializeAttachmentMetadata', () => {
       msgModel.set({
         attachments: [{ contentType: 'image/whatever' }],
       });
-      expect(hasVisualMediaAttachmentInMessage(msgModel)).to.be.true;
+      expect(hasVisualMediaAttachmentInMessage(msgModel)).to.be.eq(true);
     });
 
     it('first attachment type is jpeg should return true', () => {
@@ -159,7 +157,7 @@ describe('initializeAttachmentMetadata', () => {
       msgModel.set({
         attachments: [{ contentType: 'image/jpeg' }],
       });
-      expect(hasVisualMediaAttachmentInMessage(msgModel)).to.be.true;
+      expect(hasVisualMediaAttachmentInMessage(msgModel)).to.be.eq(true);
     });
 
     it('first attachment type is png should return true', () => {
@@ -167,7 +165,7 @@ describe('initializeAttachmentMetadata', () => {
       msgModel.set({
         attachments: [{ contentType: 'image/png' }],
       });
-      expect(hasVisualMediaAttachmentInMessage(msgModel)).to.be.true;
+      expect(hasVisualMediaAttachmentInMessage(msgModel)).to.be.eq(true);
     });
 
     it('first attachment type is JPG should return true', () => {
@@ -175,7 +173,7 @@ describe('initializeAttachmentMetadata', () => {
       msgModel.set({
         attachments: [{ contentType: 'image/JPG' }],
       });
-      expect(hasVisualMediaAttachmentInMessage(msgModel)).to.be.true;
+      expect(hasVisualMediaAttachmentInMessage(msgModel)).to.be.eq(true);
     });
 
     it('multiple attachments where one is not image and one is returns true', () => {
@@ -183,7 +181,7 @@ describe('initializeAttachmentMetadata', () => {
       msgModel.set({
         attachments: [{ contentType: 'audio/whatever' }, { contentType: 'image/JPG' }],
       });
-      expect(hasVisualMediaAttachmentInMessage(msgModel)).to.be.true;
+      expect(hasVisualMediaAttachmentInMessage(msgModel)).to.be.eq(true);
     });
 
     it('multiple attachments where both are images returns true', () => {
@@ -191,7 +189,7 @@ describe('initializeAttachmentMetadata', () => {
       msgModel.set({
         attachments: [{ contentType: 'image/whatever' }, { contentType: 'image/JPG' }],
       });
-      expect(hasVisualMediaAttachmentInMessage(msgModel)).to.be.true;
+      expect(hasVisualMediaAttachmentInMessage(msgModel)).to.be.eq(true);
     });
 
     it('multiple attachments  where none are images returns false', () => {
@@ -199,7 +197,7 @@ describe('initializeAttachmentMetadata', () => {
       msgModel.set({
         attachments: [{ contentType: 'audio/whatever' }, { contentType: 'audio/JPG' }],
       });
-      expect(hasVisualMediaAttachmentInMessage(msgModel)).to.be.false;
+      expect(hasVisualMediaAttachmentInMessage(msgModel)).to.be.eq(false);
     });
   });
 
diff --git a/ts/test/util/blockedNumberController_test.ts b/ts/test/util/blockedNumberController_test.ts
index 601bd897e1..fca76b8ae1 100644
--- a/ts/test/util/blockedNumberController_test.ts
+++ b/ts/test/util/blockedNumberController_test.ts
@@ -1,11 +1,8 @@
-// tslint:disable: no-implicit-dependencies max-func-body-length no-unused-expression
-
 import { expect } from 'chai';
 import Sinon from 'sinon';
 import { BlockedNumberController } from '../../util/blockedNumberController';
 import { TestUtils } from '../test-utils';
 
-// tslint:disable-next-line: max-func-body-length
 describe('BlockedNumberController', () => {
   let memoryDB: { [key: string]: any };
   beforeEach(() => {
@@ -48,7 +45,7 @@ describe('BlockedNumberController', () => {
     it('should return empty if nothing in the db exists', async () => {
       await BlockedNumberController.load();
       const blockedNumbers = BlockedNumberController.getBlockedNumbers();
-      expect(blockedNumbers).to.be.empty;
+      expect(blockedNumbers.length).to.be.eq(0);
     });
   });
 
@@ -73,8 +70,8 @@ describe('BlockedNumberController', () => {
       await BlockedNumberController.unblockAll([primary.key]);
 
       const blockedNumbers = BlockedNumberController.getBlockedNumbers();
-      expect(blockedNumbers).to.be.empty;
-      expect(memoryDB.blocked).to.be.empty;
+      expect(blockedNumbers.length).to.be.eq(0);
+      expect(Object.keys(memoryDB.blocked)).to.be.be.eq(0);
     });
 
     it('should only unblock if a device was blocked', async () => {
diff --git a/ts/themes/SessionTheme.tsx b/ts/themes/SessionTheme.tsx
index 4c28e306c6..d06f553e28 100644
--- a/ts/themes/SessionTheme.tsx
+++ b/ts/themes/SessionTheme.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 
 import { createGlobalStyle } from 'styled-components';
-import { classicDark } from './';
+import { classicDark } from './classicDark';
 import { declareCSSVariables, THEME_GLOBALS } from './globals';
 
 // Defaults to Classic Dark theme
diff --git a/ts/themes/constants/colors.tsx b/ts/themes/constants/colors.tsx
index 4f0191e043..ad7f68a7de 100644
--- a/ts/themes/constants/colors.tsx
+++ b/ts/themes/constants/colors.tsx
@@ -281,7 +281,6 @@ export const getThemeColors = (): Array<ThemeType> => [
     id: 'ocean-light',
     title: window.i18n('oceanLightThemeTitle'),
     style: {
-      // tslint:disable: no-non-null-assertion
       background: THEMES.OCEAN_LIGHT.COLOR7!,
       border: THEMES.OCEAN_LIGHT.COLOR3,
       receivedBackground: THEMES.OCEAN_LIGHT.COLOR1,
diff --git a/ts/themes/globals.tsx b/ts/themes/globals.tsx
index e0018ea0fd..795d116c43 100644
--- a/ts/themes/globals.tsx
+++ b/ts/themes/globals.tsx
@@ -152,6 +152,7 @@ export const THEME_GLOBALS: ThemeGlobals = {
 // These should only be needed for the global style (at root).
 export function declareCSSVariables(variables: Record<string, string>) {
   let output = '';
+  // eslint-disable-next-line no-restricted-syntax
   for (const [key, value] of Object.entries(variables)) {
     output += `${key}: ${value};\n`;
   }
diff --git a/ts/themes/oceanDark.ts b/ts/themes/oceanDark.ts
index fe9908591e..158c8d7989 100644
--- a/ts/themes/oceanDark.ts
+++ b/ts/themes/oceanDark.ts
@@ -1,4 +1,3 @@
-/* tslint:disable: no-non-null-assertion */
 import { hexColorToRGB } from '../util/hexColorToRGB';
 import { COLORS, THEMES } from './constants/colors';
 import { ThemeColorVariables } from './variableColors';
diff --git a/ts/themes/oceanLight.ts b/ts/themes/oceanLight.ts
index 4cf2d064d5..96544f6df7 100644
--- a/ts/themes/oceanLight.ts
+++ b/ts/themes/oceanLight.ts
@@ -1,4 +1,3 @@
-/* tslint:disable: no-non-null-assertion */
 import { hexColorToRGB } from '../util/hexColorToRGB';
 import { COLORS, THEMES } from './constants/colors';
 import { ThemeColorVariables } from './variableColors';
diff --git a/ts/themes/variableColors.tsx b/ts/themes/variableColors.tsx
index 105825bc5d..79d317135b 100644
--- a/ts/themes/variableColors.tsx
+++ b/ts/themes/variableColors.tsx
@@ -77,7 +77,9 @@ export type ThemeColorVariables = {
   '--button-icon-stroke-selected-color': string;
 
   /* Conversation Tab */
-  /* This is also user for Overlay Tabs, Contact Rows, Convesation List Items, Message Search Results, Message Requests Banner, Member List Item, Contact List Items, Message Right Click Highlighting etc. */
+  /* This is also user for Overlay Tabs, Contact Rows, Convesation List Items,
+   Message Search Results, Message Requests Banner, Member List Item,
+   Contact List Items, Message Right Click Highlighting etc. */
   '--conversation-tab-background-color': string;
   '--conversation-tab-background-hover-color': string;
   '--conversation-tab-background-selected-color': string;
@@ -196,6 +198,7 @@ export type ThemeColorVariables = {
 };
 
 export function loadThemeColors(variables: ThemeColorVariables) {
+  // eslint-disable-next-line no-restricted-syntax
   for (const [key, value] of Object.entries(variables)) {
     document.documentElement.style.setProperty(key, value);
   }
diff --git a/ts/types/Attachment.ts b/ts/types/Attachment.ts
index bb44d962a6..5c2559d9af 100644
--- a/ts/types/Attachment.ts
+++ b/ts/types/Attachment.ts
@@ -83,7 +83,7 @@ export function getExtensionForDisplay({
   }
 
   if (!contentType) {
-    return;
+    return undefined;
   }
 
   const slash = contentType.indexOf('/');
@@ -91,7 +91,7 @@ export function getExtensionForDisplay({
     return contentType.slice(slash + 1);
   }
 
-  return;
+  return undefined;
 }
 
 export function isAudio(attachments?: Array<AttachmentType>) {
@@ -276,7 +276,7 @@ export const isFile = (attachment: Attachment): boolean => {
 export const isVoiceMessage = (attachment: Attachment): boolean => {
   const flag = SignalService.AttachmentPointer.Flags.VOICE_MESSAGE;
   const hasFlag =
-    // tslint:disable-next-line no-bitwise
+    // eslint-disable-next-line no-bitwise
     !isUndefined(attachment.flags) && (attachment.flags & flag) === flag;
   if (hasFlag) {
     return true;
@@ -346,9 +346,8 @@ export const getFileExtension = (attachment: AttachmentType): string | undefined
       const dotLastIndex = attachment.fileName.lastIndexOf('.');
       if (dotLastIndex !== -1) {
         return attachment.fileName.substring(dotLastIndex + 1);
-      } else {
-        return undefined;
       }
+      return undefined;
     }
     return undefined;
   }
diff --git a/ts/types/MessageAttachment.ts b/ts/types/MessageAttachment.ts
index bea00fe83b..10dae7fb6d 100644
--- a/ts/types/MessageAttachment.ts
+++ b/ts/types/MessageAttachment.ts
@@ -15,8 +15,6 @@ import {
 } from './attachments/migrations';
 import { ConversationAttributes } from '../models/conversationAttributes';
 
-// tslint:disable: prefer-object-spread
-
 // I think this is only used on the renderer side, but how?!
 
 export const deleteExternalMessageFiles = async (message: {
diff --git a/ts/types/attachments/VisualAttachment.ts b/ts/types/attachments/VisualAttachment.ts
index 7de45482f7..3bec31a77f 100644
--- a/ts/types/attachments/VisualAttachment.ts
+++ b/ts/types/attachments/VisualAttachment.ts
@@ -1,16 +1,16 @@
 /* eslint-disable more/no-then */
 /* global document, URL, Blob */
 
+import { blobToArrayBuffer, dataURLToBlob } from 'blob-util';
 import { toLogFormat } from './Errors';
 
 import {
   getDecryptedBlob,
   getDecryptedMediaUrl,
-} from '../../../ts/session/crypto/DecryptedAttachmentsManager';
-import { blobToArrayBuffer, dataURLToBlob } from 'blob-util';
-import { autoScaleForAvatar, autoScaleForThumbnail } from '../../util/attachmentsUtil';
-import { GoogleChrome } from '../../util';
+} from '../../session/crypto/DecryptedAttachmentsManager';
 import { ToastUtils } from '../../session/utils';
+import { GoogleChrome } from '../../util';
+import { autoScaleForAvatar, autoScaleForThumbnail } from '../../util/attachmentsUtil';
 
 export const THUMBNAIL_SIDE = 200;
 export const THUMBNAIL_CONTENT_TYPE = 'image/png';
@@ -24,7 +24,8 @@ export const getImageDimensions = async ({
 }: {
   objectUrl: string;
 }): Promise<{ height: number; width: number }> =>
-  new Promise(async (resolve, reject) => {
+  // eslint-disable-next-line @typescript-eslint/no-misused-promises
+  new Promise((resolve, reject) => {
     const image = document.createElement('img');
 
     image.addEventListener('load', () => {
@@ -38,8 +39,12 @@ export const getImageDimensions = async ({
       reject(error);
     });
     // image/jpg is hard coded here but does not look to cause any issues
-    const decryptedUrl = await getDecryptedMediaUrl(objectUrl, 'image/jpg', false);
-    image.src = decryptedUrl;
+    void getDecryptedMediaUrl(objectUrl, 'image/jpg', false)
+      .then(decryptedUrl => {
+        image.src = decryptedUrl;
+      })
+      // eslint-disable-next-line no-console
+      .catch(console.error);
   });
 
 export const makeImageThumbnailBuffer = async ({
@@ -67,7 +72,7 @@ export const makeVideoScreenshot = async ({
   objectUrl: string;
   contentType: string | undefined;
 }) =>
-  new Promise<Blob>(async (resolve, reject) => {
+  new Promise<Blob>((resolve, reject) => {
     const video = document.createElement('video');
 
     function capture() {
@@ -94,11 +99,11 @@ export const makeVideoScreenshot = async ({
       reject(error);
     });
 
-    const decryptedUrl = await getDecryptedMediaUrl(objectUrl, contentType, false);
-    video.src = decryptedUrl;
-    video.muted = true;
-    // for some reason, this is to be started, otherwise the generated thumbnail will be empty
-    await video.play();
+    void getDecryptedMediaUrl(objectUrl, contentType, false).then(decryptedUrl => {
+      video.src = decryptedUrl;
+      video.muted = true;
+      void video.play(); // for some reason, this is to be started, otherwise the generated thumbnail will be empty
+    });
   });
 
 export const makeObjectUrl = (data: ArrayBufferLike, contentType: string) => {
@@ -150,27 +155,28 @@ export async function pickFileForAvatar(): Promise<string | null> {
     ctx.fillStyle = 'blue';
     ctx.fillRect(0, 0, canvas.width, canvas.height);
     return new Promise(resolve => {
-      canvas.toBlob(async blob => {
+      canvas.toBlob(blob => {
         const file = new File([blob as Blob], 'image.png', { type: 'image/png' });
-        const url = await autoScaleAvatarBlob(file);
-        resolve(url);
+        void autoScaleAvatarBlob(file)
+          .then(url => resolve(url))
+          // eslint-disable-next-line no-console
+          .catch(console.error);
       });
     });
-  } else {
-    const [fileHandle] = await (window as any).showOpenFilePicker({
-      types: [
-        {
-          description: 'Images',
-          accept: {
-            'image/*': ['.png', '.gif', '.jpeg', '.jpg'],
-          },
+  }
+  const [fileHandle] = await (window as any).showOpenFilePicker({
+    types: [
+      {
+        description: 'Images',
+        accept: {
+          'image/*': ['.png', '.gif', '.jpeg', '.jpg'],
         },
-      ],
-      excludeAcceptAllOption: true,
-      multiple: false,
-    });
+      },
+    ],
+    excludeAcceptAllOption: true,
+    multiple: false,
+  });
 
-    const file = (await fileHandle.getFile()) as File;
-    return autoScaleAvatarBlob(file);
-  }
+  const file = (await fileHandle.getFile()) as File;
+  return autoScaleAvatarBlob(file);
 }
diff --git a/ts/types/attachments/migrations.ts b/ts/types/attachments/migrations.ts
index 5626803d6f..63f6efff31 100644
--- a/ts/types/attachments/migrations.ts
+++ b/ts/types/attachments/migrations.ts
@@ -1,9 +1,16 @@
-import * as GoogleChrome from '../../../ts/util/GoogleChrome';
-import * as MIME from '../../../ts/types/MIME';
-import { toLogFormat } from './Errors';
 import { arrayBufferToBlob, blobToArrayBuffer } from 'blob-util';
-
 import { isString } from 'lodash';
+
+import * as MIME from '../MIME';
+import * as GoogleChrome from '../../util/GoogleChrome';
+import { toLogFormat } from './Errors';
+
+import {
+  deleteOnDisk,
+  getAbsoluteAttachmentPath,
+  readAttachmentData,
+  writeNewAttachmentData,
+} from '../MessageAttachment';
 import {
   getImageDimensions,
   makeImageThumbnailBuffer,
@@ -13,12 +20,6 @@ import {
   THUMBNAIL_CONTENT_TYPE,
   THUMBNAIL_SIDE,
 } from './VisualAttachment';
-import {
-  deleteOnDisk,
-  getAbsoluteAttachmentPath,
-  readAttachmentData,
-  writeNewAttachmentData,
-} from '../MessageAttachment';
 
 // Returns true if `rawAttachment` is a valid attachment based on our current schema.
 // Over time, we can expand this definition to become more narrow, e.g. require certain
diff --git a/ts/types/message/initializeAttachmentMetadata.ts b/ts/types/message/initializeAttachmentMetadata.ts
index aa283ade25..7f41c70036 100644
--- a/ts/types/message/initializeAttachmentMetadata.ts
+++ b/ts/types/message/initializeAttachmentMetadata.ts
@@ -15,7 +15,7 @@ export const getAttachmentMetadata = (
   hasFileAttachments: 1 | 0;
   hasVisualMediaAttachments: 1 | 0;
 } => {
-  const hasAttachments = Boolean((message.get('attachments') || []).length) ? 1 : 0;
+  const hasAttachments = (message.get('attachments') || []).length ? 1 : 0;
   const hasFileAttachments = hasFileAttachmentInMessage(message) ? 1 : 0;
   const hasVisualMediaAttachments = hasVisualMediaAttachmentInMessage(message) ? 1 : 0;
 
diff --git a/ts/types/sqlSharedTypes.ts b/ts/types/sqlSharedTypes.ts
index a3d3cf5f8d..ba54939b0c 100644
--- a/ts/types/sqlSharedTypes.ts
+++ b/ts/types/sqlSharedTypes.ts
@@ -1,3 +1,6 @@
+/* eslint-disable import/extensions */
+/* eslint-disable import/no-unresolved */
+// eslint-disable-next-line camelcase
 import { from_hex } from 'libsodium-wrappers-sumo';
 import { isArray, isEmpty, isEqual } from 'lodash';
 import { ContactInfoSet, LegacyGroupInfo, LegacyGroupMemberInfo } from 'libsession_util_nodejs';
@@ -209,7 +212,7 @@ export function getLegacyGroupInfoFromDBValues({
   lastJoinedTimestamp,
 }: Pick<
   ConversationAttributes,
-  'id' | 'priority' | 'displayNameInProfile' | 'lastJoinedTimestamp' //| 'expireTimer'
+  'id' | 'priority' | 'displayNameInProfile' | 'lastJoinedTimestamp' // | 'expireTimer'
 > & {
   encPubkeyHex: string;
   encSeckeyHex: string;
@@ -245,7 +248,8 @@ export function getLegacyGroupInfoFromDBValues({
  */
 export function assertUnreachable(_x: never, message: string): never {
   const msg = `assertUnreachable: Didn't expect to get here with "${message}"`;
-  // tslint:disable: no-console
+  // eslint:disable: no-console
+  // eslint-disable-next-line no-console
   console.info(msg);
   throw new Error(msg);
 }
diff --git a/ts/updater/index.ts b/ts/updater/index.ts
index ab4ba4e951..7fd408b8a5 100644
--- a/ts/updater/index.ts
+++ b/ts/updater/index.ts
@@ -51,8 +51,6 @@ function autoUpdateDisabled() {
   const autoUpdate = typeof userSetting !== 'boolean' || userSetting;
 
   return (
-    process.mas || // From Electron: Mac App Store build
-    // tslint:disable-next-line: no-backbone-get-set-outside-model
-    !autoUpdate // User setting
+    process.mas || !autoUpdate // From Electron: Mac App Store build // User setting
   );
 }
diff --git a/ts/updater/updater.ts b/ts/updater/updater.ts
index ce592fb110..785b4d9cd6 100644
--- a/ts/updater/updater.ts
+++ b/ts/updater/updater.ts
@@ -1,9 +1,14 @@
-import * as path from 'path';
-import * as fs from 'fs-extra';
-import { autoUpdater, UpdateInfo } from 'electron-updater';
+/* eslint-disable @typescript-eslint/no-misused-promises */
+/* eslint-disable no-console */
 import { app, BrowserWindow } from 'electron';
+import { autoUpdater, UpdateInfo } from 'electron-updater';
+import * as fs from 'fs-extra';
+import * as path from 'path';
+import { gt as isVersionGreaterThan, parse as parseVersion } from 'semver';
+
 import { windowMarkShouldQuit } from '../node/window_state';
 
+import { getLastestRelease } from '../node/latest_desktop_release';
 import {
   getPrintableError,
   LoggerType,
@@ -12,14 +17,12 @@ import {
   showDownloadUpdateDialog,
   showUpdateDialog,
 } from './common';
-import { gt as isVersionGreaterThan, parse as parseVersion } from 'semver';
-import { getLastestRelease } from '../node/latest_desktop_release';
 
 let isUpdating = false;
 let downloadIgnored = false;
 let interval: NodeJS.Timeout | undefined;
 let stopped = false;
-// tslint:disable: no-console
+// eslint:disable: no-console
 
 export async function start(
   getMainWindow: () => BrowserWindow | null,
@@ -202,7 +205,6 @@ async function canAutoUpdate(): Promise<boolean> {
 
   return new Promise(resolve => {
     try {
-      // tslint:disable-next-line: non-literal-fs-path
       const exists = fs.existsSync(appUpdateConfigPath);
       resolve(exists);
     } catch (e) {
diff --git a/ts/util/abbreviateNumber.ts b/ts/util/abbreviateNumber.ts
index abc18a6758..9870164afa 100644
--- a/ts/util/abbreviateNumber.ts
+++ b/ts/util/abbreviateNumber.ts
@@ -5,12 +5,12 @@ const abbreviations = ['k', 'm', 'b', 't'];
 
 export function abbreviateNumber(number: number, decimals: number = 2): string {
   let result = String(number);
-  const d = Math.pow(10, decimals);
+  const d = 10 ** decimals;
 
   // Go through the array backwards, so we do the largest first
   for (let i = abbreviations.length - 1; i >= 0; i--) {
     // Convert array index to "1000", "1000000", etc
-    const size = Math.pow(10, (i + 1) * 3);
+    const size = 10 ** ((i + 1) * 3);
 
     // If the number is bigger or equal do the abbreviation
     if (size <= number) {
diff --git a/ts/util/accountManager.ts b/ts/util/accountManager.ts
index cbe6961bb4..b95a6bb92f 100644
--- a/ts/util/accountManager.ts
+++ b/ts/util/accountManager.ts
@@ -5,7 +5,7 @@ import { getOurPubKeyStrFromCache } from '../session/utils/User';
 import { trigger } from '../shims/events';
 
 import { actions as userActions } from '../state/ducks/user';
-import { mn_decode, mn_encode } from '../session/crypto/mnemonic';
+import { mnDecode, mnEncode } from '../session/crypto/mnemonic';
 import { SettingsKey } from '../data/settings-key';
 import {
   saveRecoveryPhrase,
@@ -48,7 +48,7 @@ const generateKeypair = async (
   mnemonic: string,
   mnemonicLanguage: string
 ): Promise<SessionKeyPair> => {
-  let seedHex = mn_decode(mnemonic, mnemonicLanguage);
+  let seedHex = mnDecode(mnemonic, mnemonicLanguage);
   // handle shorter than 32 bytes seeds
   const privKeyHexLength = 32 * 2;
   if (seedHex.length !== privKeyHexLength) {
@@ -133,7 +133,7 @@ export async function generateMnemonic() {
   const seedSize = 16;
   const seed = (await getSodiumRenderer()).randombytes_buf(seedSize);
   const hex = toHex(seed);
-  return mn_encode(hex);
+  return mnEncode(hex);
 }
 
 async function createAccount(identityKeyPair: SessionKeyPair) {
diff --git a/ts/util/attachmentsUtil.ts b/ts/util/attachmentsUtil.ts
index 46812f53ae..e0dc727ecb 100644
--- a/ts/util/attachmentsUtil.ts
+++ b/ts/util/attachmentsUtil.ts
@@ -1,15 +1,17 @@
+/* eslint-disable max-len */
+import imageType from 'image-type';
+
+import { arrayBufferToBlob } from 'blob-util';
+import loadImage, { LoadImageOptions } from 'blueimp-load-image';
+import { StagedAttachmentType } from '../components/conversation/composition/CompositionBox';
 import { SignalService } from '../protobuf';
-import loadImage, { CropOptions, LoadImageOptions } from 'blueimp-load-image';
 import { getDecryptedMediaUrl } from '../session/crypto/DecryptedAttachmentsManager';
 import { sendDataExtractionNotification } from '../session/messages/outgoing/controlMessage/DataExtractionNotificationMessage';
 import { AttachmentType, save } from '../types/Attachment';
-import { StagedAttachmentType } from '../components/conversation/composition/CompositionBox';
-import { getAbsoluteAttachmentPath, processNewAttachment } from '../types/MessageAttachment';
-import { arrayBufferToBlob } from 'blob-util';
 import { IMAGE_GIF, IMAGE_JPEG, IMAGE_PNG, IMAGE_TIFF, IMAGE_UNKNOWN } from '../types/MIME';
+import { getAbsoluteAttachmentPath, processNewAttachment } from '../types/MessageAttachment';
 import { THUMBNAIL_SIDE } from '../types/attachments/VisualAttachment';
 
-import imageType from 'image-type';
 import { MAX_ATTACHMENT_FILESIZE_BYTES } from '../session/constants';
 import { perfEnd, perfStart } from '../session/utils/Performance';
 
@@ -147,7 +149,7 @@ async function canvasToBlob(
  * @param attachment The attachment to scale down
  * @param maxMeasurements any of those will be used if set
  */
-// tslint:disable-next-line: cyclomatic-complexity
+
 export async function autoScale<T extends { contentType: string; blob: Blob }>(
   attachment: T,
   maxMeasurements?: MaxScaleSize
@@ -187,14 +189,10 @@ export async function autoScale<T extends { contentType: string; blob: Blob }>(
     throw new Error(`GIF is too large, required size is ${maxSize}`);
   }
 
-  const crop: CropOptions = {
-    crop: makeSquare,
-  };
-
   const loadImgOpts: LoadImageOptions = {
     maxWidth: makeSquare ? maxMeasurements?.maxSide : maxWidth,
     maxHeight: makeSquare ? maxMeasurements?.maxSide : maxHeight,
-    ...crop,
+    crop: !!makeSquare,
     orientation: 1,
     aspectRatio: makeSquare ? 1 : undefined,
     canvas: true,
@@ -244,6 +242,7 @@ export async function autoScale<T extends { contentType: string; blob: Blob }>(
     if (DEBUG_ATTACHMENTS_SCALE) {
       // window.log.info(`autoscale iteration: [${i}] for:`, attachment);
     }
+    // eslint-disable-next-line no-await-in-loop
     const tempBlob = await canvasToBlob(canvas.image as HTMLCanvasElement, 'image/jpeg', quality);
 
     if (!tempBlob) {
diff --git a/ts/util/attachments_files.ts b/ts/util/attachments_files.ts
index 94076f1460..1a87497105 100644
--- a/ts/util/attachments_files.ts
+++ b/ts/util/attachments_files.ts
@@ -8,10 +8,6 @@ import {
   encryptAttachmentBufferRenderer,
 } from './local_attachments_encrypter';
 
-if (window) {
-  //tslint-disable no-empty
-}
-
 // to me, this file is only used in the renderer
 // import { decryptAttachmentBuffer, encryptAttachmentBuffer } from './encrypt_attachment_buffer';
 
diff --git a/ts/util/blockedNumberController.ts b/ts/util/blockedNumberController.ts
index d65a3a3310..76d5aa77c7 100644
--- a/ts/util/blockedNumberController.ts
+++ b/ts/util/blockedNumberController.ts
@@ -5,7 +5,6 @@ import { Storage } from './storage';
 
 const BLOCKED_NUMBERS_ID = 'blocked';
 
-// tslint:disable-next-line: no-unnecessary-class
 export class BlockedNumberController {
   private static loaded: boolean = false;
   private static blockedNumbers: Set<string> = new Set();
@@ -64,6 +63,7 @@ export class BlockedNumberController {
     for (let index = 0; index < users.length; index++) {
       const user = users[index];
       try {
+        // eslint-disable-next-line no-await-in-loop
         await commitConversationAndRefreshWrapper(user);
       } catch (e) {
         window.log.warn(
diff --git a/ts/util/crypto/attachmentsEncrypter.ts b/ts/util/crypto/attachmentsEncrypter.ts
index 3258bf5390..141fd0cbdc 100644
--- a/ts/util/crypto/attachmentsEncrypter.ts
+++ b/ts/util/crypto/attachmentsEncrypter.ts
@@ -1,11 +1,9 @@
-// tslint:disable: binary-expression-operand-order
-// tslint:disable: restrict-plus-operands
-// tslint:disable: no-function-expression
+/* eslint-disable more/no-then */
 
 async function sign(key: any, data: any) {
   return crypto.subtle
     .importKey('raw', key, { name: 'HMAC', hash: { name: 'SHA-256' } }, false, ['sign'])
-    .then(async function(secondKey) {
+    .then(async secondKey => {
       return crypto.subtle.sign({ name: 'HMAC', hash: 'SHA-256' }, secondKey, data);
     });
 }
@@ -13,14 +11,14 @@ async function sign(key: any, data: any) {
 async function encrypt(key: any, data: any, iv: any) {
   return crypto.subtle
     .importKey('raw', key, { name: 'AES-CBC' }, false, ['encrypt'])
-    .then(async function(secondKey) {
+    .then(async secondKey => {
       return crypto.subtle.encrypt({ name: 'AES-CBC', iv: new Uint8Array(iv) }, secondKey, data);
     });
 }
 async function decrypt(key: any, data: any, iv: any) {
   return crypto.subtle
     .importKey('raw', key, { name: 'AES-CBC' }, false, ['decrypt'])
-    .then(async function(secondKey) {
+    .then(async secondKey => {
       return crypto.subtle.decrypt({ name: 'AES-CBC', iv: new Uint8Array(iv) }, secondKey, data);
     });
 }
@@ -28,17 +26,16 @@ async function calculateMAC(key: any, data: any) {
   return sign(key, data);
 }
 async function verifyMAC(data: any, key: any, mac: any, length: any) {
-  // tslint:disable-next-line: variable-name
-  return sign(key, data).then(function(calculated_mac) {
-    if (mac.byteLength !== length || calculated_mac.byteLength < length) {
+  return sign(key, data).then(calculatedMac => {
+    if (mac.byteLength !== length || calculatedMac.byteLength < length) {
       throw new Error('Bad MAC length');
     }
-    const a = new Uint8Array(calculated_mac);
+    const a = new Uint8Array(calculatedMac);
     const b = new Uint8Array(mac);
     let result = 0;
     for (let i = 0; i < mac.byteLength; ++i) {
-      // tslint:disable-next-line: no-bitwise
-      result = result | (a[i] ^ b[i]);
+      // eslint-disable-next-line no-bitwise
+      result |= a[i] ^ b[i];
     }
     if (result !== 0) {
       throw new Error('Bad MAC');
@@ -52,7 +49,7 @@ async function verifyDigest(data: ArrayBuffer, theirDigest: ArrayBuffer) {
     const b = new Uint8Array(theirDigest);
     let result = 0;
     for (let i = 0; i < theirDigest.byteLength; i += 1) {
-      // tslint:disable-next-line: no-bitwise
+      // eslint-disable-next-line no-bitwise
       result |= a[i] ^ b[i];
     }
     if (result !== 0) {
diff --git a/ts/util/crypto/profileEncrypter.ts b/ts/util/crypto/profileEncrypter.ts
index 3a345bde76..d63c8ed4b3 100644
--- a/ts/util/crypto/profileEncrypter.ts
+++ b/ts/util/crypto/profileEncrypter.ts
@@ -1,3 +1,4 @@
+/* eslint-disable more/no-then */
 import { getSodiumRenderer } from '../../session/crypto';
 
 const PROFILE_IV_LENGTH = 12; // bytes
@@ -34,6 +35,7 @@ export async function decryptProfile(data: ArrayBuffer, key: ArrayBuffer): Promi
             error.name = 'ProfileDecryptError';
             throw error;
           }
+          throw error;
         })
     );
 }
@@ -56,7 +58,6 @@ export async function encryptProfile(data: ArrayBuffer, key: ArrayBuffer): Promi
       crypto.subtle
         .encrypt({ name: 'AES-GCM', iv, tagLength: PROFILE_TAG_LENGTH }, keyForEncryption, data)
         .then(ciphertext => {
-          // tslint:disable-next-line: restrict-plus-operands
           const ivAndCiphertext = new Uint8Array(PROFILE_IV_LENGTH + ciphertext.byteLength);
           ivAndCiphertext.set(new Uint8Array(iv));
           ivAndCiphertext.set(new Uint8Array(ciphertext), PROFILE_IV_LENGTH);
diff --git a/ts/util/emoji.ts b/ts/util/emoji.ts
index d3dbed3035..7892f2583c 100644
--- a/ts/util/emoji.ts
+++ b/ts/util/emoji.ts
@@ -1,6 +1,9 @@
+/* eslint-disable no-restricted-syntax */
+/* eslint-disable no-continue */
+/* eslint-disable no-param-reassign */
+/* eslint-disable import/no-mutable-exports  */
+import { PartialI18n, init } from 'emoji-mart';
 import { FixedBaseEmoji, NativeEmojiData } from '../types/Reaction';
-// @ts-ignore
-import { init, PartialI18n } from 'emoji-mart';
 import { loadEmojiPanelI18n } from './i18n';
 
 export type SizeClassType = 'default' | 'small' | 'medium' | 'large' | 'jumbo';
@@ -33,13 +36,14 @@ export function getEmojiSizeClass(str: string): SizeClassType {
   const emojiCount = getCountOfAllMatches(str);
   if (emojiCount > 6) {
     return 'small';
-  } else if (emojiCount > 4) {
+  }
+  if (emojiCount > 4) {
     return 'medium';
-  } else if (emojiCount > 2) {
+  }
+  if (emojiCount > 2) {
     return 'large';
-  } else {
-    return 'jumbo';
   }
+  return 'jumbo';
 }
 
 export let nativeEmojiData: NativeEmojiData | null = null;
diff --git a/ts/util/expiringMessages.ts b/ts/util/expiringMessages.ts
index 239455e583..e7df1ba95f 100644
--- a/ts/util/expiringMessages.ts
+++ b/ts/util/expiringMessages.ts
@@ -29,7 +29,7 @@ export async function destroyMessagesAndUpdateRedux(
   window.inboxStore?.dispatch(messagesExpired(messages));
 
   // trigger a refresh the last message for all those uniq conversation
-  conversationWithChanges.map(convoIdToUpdate => {
+  conversationWithChanges.forEach(convoIdToUpdate => {
     getConversationController()
       .get(convoIdToUpdate)
       ?.updateLastMessage();
@@ -49,7 +49,7 @@ async function destroyExpiredMessages() {
       messageId: m.id,
     }));
 
-    messages.map(expired => {
+    messages.forEach(expired => {
       window.log.info('Message expired', {
         sentAt: expired.get('sent_at'),
       });
@@ -98,7 +98,7 @@ async function checkExpiringMessages() {
   if (timeout) {
     global.clearTimeout(timeout);
   }
-  timeout = global.setTimeout(destroyExpiredMessages, wait);
+  timeout = global.setTimeout(() => void destroyExpiredMessages(), wait);
 }
 const throttledCheckExpiringMessages = throttle(checkExpiringMessages, 1000);
 
@@ -111,7 +111,7 @@ const initExpiringMessageListener = () => {
 
   void checkExpiringMessages();
 
-  initWallClockListener(throttledCheckExpiringMessages);
+  initWallClockListener(() => void throttledCheckExpiringMessages());
   isInit = true;
 };
 
diff --git a/ts/util/i18n.ts b/ts/util/i18n.ts
index 90ccf33f22..70d8fb5201 100644
--- a/ts/util/i18n.ts
+++ b/ts/util/i18n.ts
@@ -13,7 +13,8 @@ export const setupi18n = (locale: string, messages: LocaleMessagesType) => {
   function getMessage(key: string, substitutions: Array<string>) {
     const message = messages[key];
     if (!message) {
-      // tslint:disable-next-line: no-console
+      // eslint:disable: no-console
+      // eslint-disable-next-line no-console
       (window.log.error || console.log)(
         `i18n: Attempted to get translation for nonexistent key '${key}'`
       );
@@ -29,7 +30,8 @@ export const setupi18n = (locale: string, messages: LocaleMessagesType) => {
       );
 
       return substituted.replaceAll('ￗ', '$');
-    } else if (substitutions) {
+    }
+    if (substitutions) {
       return message.replace(/\$.+?\$/, substitutions);
     }
 
@@ -41,6 +43,7 @@ export const setupi18n = (locale: string, messages: LocaleMessagesType) => {
   return getMessage;
 };
 
+// eslint-disable-next-line import/no-mutable-exports
 export let langNotSupportedMessageShown = false;
 
 export const loadEmojiPanelI18n = async () => {
@@ -62,4 +65,5 @@ export const loadEmojiPanelI18n = async () => {
       }
     }
   }
+  return undefined;
 };
diff --git a/ts/util/index.ts b/ts/util/index.ts
index 0f359efc47..83d746404a 100644
--- a/ts/util/index.ts
+++ b/ts/util/index.ts
@@ -1,17 +1,9 @@
 import * as GoogleChrome from './GoogleChrome';
 import { arrayBufferToObjectURL } from './arrayBufferToObjectURL';
 import { missingCaseError } from './missingCaseError';
-import { makeLookup } from './makeLookup';
 import * as AttachmentUtil from './attachmentsUtil';
 import * as LinkPreviewUtil from './linkPreviewFetch';
 
 export * from './blockedNumberController';
 
-export {
-  arrayBufferToObjectURL,
-  GoogleChrome,
-  makeLookup,
-  missingCaseError,
-  AttachmentUtil,
-  LinkPreviewUtil,
-};
+export { arrayBufferToObjectURL, GoogleChrome, missingCaseError, AttachmentUtil, LinkPreviewUtil };
diff --git a/ts/util/linkPreviewFetch.ts b/ts/util/linkPreviewFetch.ts
index 3f99e9391b..86d1fdc407 100644
--- a/ts/util/linkPreviewFetch.ts
+++ b/ts/util/linkPreviewFetch.ts
@@ -4,7 +4,6 @@ import { AbortSignal } from 'abort-controller';
 import { IMAGE_GIF, IMAGE_ICO, IMAGE_JPEG, IMAGE_PNG, IMAGE_WEBP, MIMEType } from '../types/MIME';
 
 const MAX_REQUEST_COUNT_WITH_REDIRECTS = 20;
-// tslint:disable: prefer-for-of
 
 // Lifted from the `fetch` spec [here][0].
 // [0]: https://fetch.spec.whatwg.org/#redirect-status
diff --git a/ts/util/linkPreviews.ts b/ts/util/linkPreviews.ts
index 1d72647cf4..ba78f0d6cf 100644
--- a/ts/util/linkPreviews.ts
+++ b/ts/util/linkPreviews.ts
@@ -79,6 +79,7 @@ const VALID_URI_CHARACTERS = new Set([
   '_',
   '~',
 ]);
+// eslint-disable-next-line prefer-regex-literals
 const ASCII_PATTERN = new RegExp('[\\u0020-\\u007F]', 'g');
 const MAX_HREF_LENGTH = 2 ** 12;
 
diff --git a/ts/util/makeLookup.ts b/ts/util/makeLookup.ts
deleted file mode 100644
index 3042c518e7..0000000000
--- a/ts/util/makeLookup.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { fromPairs, map } from 'lodash';
-
-export function makeLookup<T>(items: Array<T>, key: string): { [key: string]: T } {
-  // Yep, we can't index into item without knowing what it is. True. But we want to.
-  // @ts-ignore
-  const pairs = map(items, item => [item[key], item]);
-
-  return fromPairs(pairs);
-}
diff --git a/ts/util/notifications.ts b/ts/util/notifications.ts
index 8950cf1f54..f4fcf4b085 100644
--- a/ts/util/notifications.ts
+++ b/ts/util/notifications.ts
@@ -116,7 +116,6 @@ function clearByMessageId(messageId: string) {
   }
 }
 
-// tslint:disable-next-line: cyclomatic-complexity
 function update(forceRefresh = false) {
   if (lastNotificationDisplayed) {
     lastNotificationDisplayed.close();
diff --git a/ts/util/privacy.ts b/ts/util/privacy.ts
index 203e08498c..387876f0b6 100644
--- a/ts/util/privacy.ts
+++ b/ts/util/privacy.ts
@@ -1,6 +1,5 @@
 /* eslint-env node */
 
-// tslint:disable-next-line: no-submodule-imports
 import { escapeRegExp, isEmpty, isRegExp, isString } from 'lodash';
 import { compose } from 'lodash/fp';
 import { getAppRootPath } from '../node/getRootPath';
diff --git a/ts/util/reactions.ts b/ts/util/reactions.ts
index f1f40d46c7..cb1cad416b 100644
--- a/ts/util/reactions.ts
+++ b/ts/util/reactions.ts
@@ -6,7 +6,7 @@ import { isUsAnySogsFromCache } from '../session/apis/open_group_api/sogsv3/know
 import { ToastUtils, UserUtils } from '../session/utils';
 
 import { Action, OpenGroupReactionList, ReactionList, RecentReactions } from '../types/Reaction';
-import { getRecentReactions, saveRecentReations } from '../util/storage';
+import { getRecentReactions, saveRecentReations } from './storage';
 
 const SOGSReactorsFetchCount = 5;
 const rateCountLimit = 20;
@@ -23,9 +23,8 @@ function hitRateLimit(): boolean {
       latestReactionTimestamps.pop();
       window.log.warn(`Only ${rateCountLimit} reactions are allowed per minute`);
       return true;
-    } else {
-      latestReactionTimestamps.shift();
     }
+    latestReactionTimestamps.shift();
   }
   return false;
 }
@@ -74,17 +73,17 @@ const sendMessageReaction = async (messageId: string, emoji: string) => {
     const conversationModel = found?.getConversation();
     if (!conversationModel) {
       window.log.warn(`Conversation for ${messageId} not found in db`);
-      return;
+      return undefined;
     }
 
     if (!conversationModel.hasReactions()) {
       window.log.warn("This conversation doesn't have reaction support");
-      return;
+      return undefined;
     }
 
     if (hitRateLimit()) {
       ToastUtils.pushRateLimitHitReactions();
-      return;
+      return undefined;
     }
 
     let me = UserUtils.getOurPubKeyStrFromCache();
@@ -96,7 +95,7 @@ const sendMessageReaction = async (messageId: string, emoji: string) => {
         me = conversationModel.getUsInThatConversation();
       } else {
         window.log.warn(`Server Id was not found in message ${messageId} for opengroup reaction`);
-        return;
+        return undefined;
       }
     }
 
@@ -131,10 +130,9 @@ const sendMessageReaction = async (messageId: string, emoji: string) => {
       found.get('isPublic') ? `on ${conversationModel.id}` : ''
     );
     return reaction;
-  } else {
-    window.log.warn(`Message ${messageId} not found in db`);
-    return;
   }
+  window.log.warn(`Message ${messageId} not found in db`);
+  return undefined;
 };
 
 /**
@@ -154,12 +152,12 @@ const handleMessageReaction = async ({
 }) => {
   if (!reaction.emoji) {
     window?.log?.warn(`There is no emoji for the reaction ${reaction}.`);
-    return;
+    return undefined;
   }
 
   const originalMessage = await getMessageByReaction(reaction, openGroupConversationId);
   if (!originalMessage) {
-    return;
+    return undefined;
   }
 
   const reacts: ReactionList = originalMessage.get('reacts') ?? {};
@@ -171,10 +169,9 @@ const handleMessageReaction = async ({
   if (details.you && senders.includes(sender)) {
     if (reaction.action === Action.REACT) {
       window.log.warn('Received duplicate message for your reaction. Ignoring it');
-      return;
-    } else {
-      details.you = false;
+      return undefined;
     }
+    details.you = false;
   } else {
     details.you = you;
   }
@@ -183,7 +180,7 @@ const handleMessageReaction = async ({
     case Action.REACT:
       if (senders.includes(sender)) {
         window.log.warn('Received duplicate reaction message. Ignoring it', reaction, sender);
-        return;
+        return undefined;
       }
       details.senders.push(sender);
       count += 1;
@@ -209,7 +206,6 @@ const handleMessageReaction = async ({
       originalMessage.set('reactsIndex', (originalMessage.get('reactsIndex') ?? 0) + 1);
     }
   } else {
-    // tslint:disable-next-line: no-dynamic-delete
     delete reacts[reaction.emoji];
   }
 
@@ -239,12 +235,11 @@ const handleClearReaction = async (conversationId: string, serverId: number, emo
     window?.log?.debug(
       `Cannot find the original reacted message ${serverId} in conversation ${conversationId}.`
     );
-    return;
+    return undefined;
   }
 
   const reacts: ReactionList | undefined = originalMessage.get('reacts');
   if (reacts) {
-    // tslint:disable-next-line: no-dynamic-delete
     delete reacts[emoji];
   }
 
@@ -272,12 +267,12 @@ const handleOpenGroupMessageReactions = async (
     window?.log?.debug(
       `Cannot find the original reacted message ${serverId} in conversation ${conversationId}.`
     );
-    return;
+    return undefined;
   }
 
   if (!originalMessage.get('isPublic')) {
     window.log.warn('handleOpenGroupMessageReactions() should only be used in opengroups');
-    return;
+    return undefined;
   }
 
   if (isEmpty(reactions)) {
@@ -307,6 +302,7 @@ const handleOpenGroupMessageReactions = async (
           if (conversationModel) {
             const me =
               conversationModel.getUsInThatConversation() || UserUtils.getOurPubKeyStrFromCache();
+            // eslint-disable-next-line no-param-reassign
             reactions[key].reactors = [me, ...reactorsWithoutMe];
           }
         }
@@ -325,7 +321,6 @@ const handleOpenGroupMessageReactions = async (
           you,
         };
       } else {
-        // tslint:disable-next-line: no-dynamic-delete
         delete reacts[key];
       }
     });
diff --git a/ts/util/readReceipts.ts b/ts/util/readReceipts.ts
index e730f907c0..624413ba2b 100644
--- a/ts/util/readReceipts.ts
+++ b/ts/util/readReceipts.ts
@@ -1,4 +1,3 @@
-import _ from 'lodash';
 import { MessageCollection } from '../models/message';
 
 import { Data } from '../data/data';
diff --git a/ts/util/releaseFeature.ts b/ts/util/releaseFeature.ts
index 602f3b553e..76f2e972d3 100644
--- a/ts/util/releaseFeature.ts
+++ b/ts/util/releaseFeature.ts
@@ -15,6 +15,7 @@ export function resetFeatureReleasedCachedValue() {
   isUserConfigLibsessionFeatureReleased = undefined;
 }
 
+// eslint-disable-next-line consistent-return
 function getIsFeatureReleasedCached(featureName: FeatureNameTracked) {
   switch (featureName) {
     case 'disappearing_messages':
@@ -39,6 +40,7 @@ function setIsFeatureReleasedCached(featureName: FeatureNameTracked, value: bool
   }
 }
 
+// eslint-disable-next-line consistent-return
 function getFeatureReleaseTimestamp(featureName: FeatureNameTracked) {
   switch (featureName) {
     case 'disappearing_messages':
diff --git a/ts/util/saveQRCode.ts b/ts/util/saveQRCode.ts
index 785a9f3152..9e2c5a70c1 100644
--- a/ts/util/saveQRCode.ts
+++ b/ts/util/saveQRCode.ts
@@ -9,7 +9,6 @@ export function saveQRCode(
 ): void {
   const qrSVG = document.querySelector('.qr-image svg');
   if (qrSVG) {
-    // tslint:disable-next-line: no-http-string
     qrSVG.setAttribute('xmlns', 'http://www.w3.org/2000/svg');
     qrSVG.setAttribute('width', width);
     qrSVG.setAttribute('height', height);
diff --git a/ts/util/storage.ts b/ts/util/storage.ts
index 856f77f4d6..ba229323ce 100644
--- a/ts/util/storage.ts
+++ b/ts/util/storage.ts
@@ -1,8 +1,8 @@
+import { isBoolean } from 'lodash';
 import { Data } from '../data/data';
 import { SessionKeyPair } from '../receiver/keypairs';
 import { DEFAULT_RECENT_REACTS } from '../session/constants';
 import { deleteSettingsBoolValue, updateSettingsBoolValue } from '../state/ducks/settings';
-import { isBoolean } from 'lodash';
 import { ReleasedFeatures } from './releaseFeature';
 
 let ready = false;
@@ -50,7 +50,6 @@ async function remove(key: string) {
     window.log.warn('Called storage.get before storage is ready. key:', key);
   }
 
-  // tslint:disable-next-line: no-dynamic-delete
   delete items[key];
 
   window?.inboxStore?.dispatch(deleteSettingsBoolValue(key));
@@ -79,7 +78,6 @@ async function fetch() {
   reset();
   const array = await Data.getAllItems();
 
-  // tslint:disable-next-line: one-variable-per-declaration
   for (let i = 0, max = array.length; i < max; i += 1) {
     const item = array[i];
     const { id } = item;
@@ -154,9 +152,8 @@ export function getRecentReactions(): Array<string> {
   const reactions = Storage.get('recent_reactions') as string;
   if (reactions) {
     return reactions.split(' ');
-  } else {
-    return DEFAULT_RECENT_REACTS;
   }
+  return DEFAULT_RECENT_REACTS;
 }
 
 export async function saveRecentReations(reactions: Array<string>) {
diff --git a/ts/webworker/worker_interface.ts b/ts/webworker/worker_interface.ts
index 201ed703fc..84f29845ad 100644
--- a/ts/webworker/worker_interface.ts
+++ b/ts/webworker/worker_interface.ts
@@ -43,7 +43,7 @@ export class WorkerInterface {
       const { resolve, reject, fnName } = job;
 
       if (errorForDisplay) {
-        // tslint:disable: no-console
+        // eslint:disable: no-console
 
         window?.log?.error(`Error received from worker job ${jobId} (${fnName}):`, errorForDisplay);
         return reject(
@@ -118,7 +118,6 @@ export class WorkerInterface {
     if (this._DEBUG) {
       this._jobs[id].complete = true;
     } else {
-      // tslint:disable-next-line: no-dynamic-delete
       delete this._jobs[id];
     }
   }
diff --git a/ts/webworker/workers/browser/libsession_worker_interface.ts b/ts/webworker/workers/browser/libsession_worker_interface.ts
index fb2555e9a1..419aba445a 100644
--- a/ts/webworker/workers/browser/libsession_worker_interface.ts
+++ b/ts/webworker/workers/browser/libsession_worker_interface.ts
@@ -1,8 +1,6 @@
+/* eslint-disable import/extensions */
+/* eslint-disable import/no-unresolved */
 import { join } from 'path';
-import { getAppRootPath } from '../../../node/getRootPath';
-import { WorkerInterface } from '../../worker_interface';
-import { ConfigWrapperObjectTypes, LibSessionWorkerFunctions } from './libsession_worker_functions';
-
 import {
   BaseWrapperActionsCalls,
   ContactInfoSet,
@@ -13,6 +11,10 @@ import {
   UserGroupsWrapperActionsCalls,
 } from 'libsession_util_nodejs';
 
+import { getAppRootPath } from '../../../node/getRootPath';
+import { WorkerInterface } from '../../worker_interface';
+import { ConfigWrapperObjectTypes, LibSessionWorkerFunctions } from './libsession_worker_functions';
+
 let libsessionWorkerInterface: WorkerInterface | undefined;
 
 const internalCallLibSessionWorker = async ([
diff --git a/ts/webworker/workers/browser/util_worker_interface.ts b/ts/webworker/workers/browser/util_worker_interface.ts
index 4a995ebe94..cafef5cd94 100644
--- a/ts/webworker/workers/browser/util_worker_interface.ts
+++ b/ts/webworker/workers/browser/util_worker_interface.ts
@@ -1,6 +1,6 @@
-import { WorkerInterface } from '../../worker_interface';
 import { join } from 'path';
 import { getAppRootPath } from '../../../node/getRootPath';
+import { WorkerInterface } from '../../worker_interface';
 
 let utilWorkerInterface: WorkerInterface | undefined;
 
diff --git a/ts/webworker/workers/index.ts b/ts/webworker/workers/index.ts
index 58bea990d6..c5ce4c98aa 100644
--- a/ts/webworker/workers/index.ts
+++ b/ts/webworker/workers/index.ts
@@ -1,3 +1,4 @@
 import * as utilWorkerInterface from './browser/util_worker_interface';
 import * as libSessionWorkerInterface from './browser/libsession_worker_interface';
+
 export { utilWorkerInterface, libSessionWorkerInterface };
diff --git a/ts/webworker/workers/node/libsession/libsession.worker.ts b/ts/webworker/workers/node/libsession/libsession.worker.ts
index d86a070ae5..75100a511a 100644
--- a/ts/webworker/workers/node/libsession/libsession.worker.ts
+++ b/ts/webworker/workers/node/libsession/libsession.worker.ts
@@ -1,3 +1,5 @@
+/* eslint-disable consistent-return */
+/* eslint-disable no-case-declarations */
 import { isEmpty, isNull } from 'lodash';
 import {
   BaseConfigWrapperNode,
@@ -6,11 +8,11 @@ import {
   UserConfigWrapperNode,
   UserGroupsWrapperNode,
 } from 'libsession_util_nodejs';
+// eslint-disable-next-line import/no-unresolved, import/extensions
 import { ConfigWrapperObjectTypes } from '../../browser/libsession_worker_functions';
 
 /* eslint-disable no-console */
 /* eslint-disable strict */
-// tslint:disable: no-console
 
 /**
  *
@@ -117,8 +119,6 @@ function initUserWrapper(options: Array<any>, wrapperType: ConfigWrapperObjectTy
   }
 }
 
-// tslint:disable: function-name no-console
-
 onmessage = async (e: { data: [number, ConfigWrapperObjectTypes, string, ...any] }) => {
   const [jobId, config, action, ...args] = e.data;
 
diff --git a/ts/webworker/workers/node/util/util.worker.ts b/ts/webworker/workers/node/util/util.worker.ts
index f0ab356e9e..8c3148c205 100644
--- a/ts/webworker/workers/node/util/util.worker.ts
+++ b/ts/webworker/workers/node/util/util.worker.ts
@@ -1,5 +1,6 @@
 import ByteBuffer from 'bytebuffer';
 import { generateKeyPair, sharedKey, verify } from 'curve25519-js';
+// eslint-disable-next-line import/no-named-default
 import { default as sodiumWrappers } from 'libsodium-wrappers-sumo';
 import _ from 'lodash';
 import {
@@ -28,8 +29,7 @@ const functions = {
   encryptAttachmentBufferNode,
   bytesFromString,
 };
-// tslint:disable: function-name
-//tslint-disable no-console
+
 onmessage = async (e: any) => {
   const [jobId, fnName, ...args] = e.data;
 
@@ -100,10 +100,11 @@ async function verifyAllSignatures(
 ) {
   const checked = [];
   // keep this out of a racing (i.e. no Promise.all) for easier debugging for now
-  // tslint:disable-next-line: prefer-for-of
+  // eslint-disable-next-line: prefer-for-of
   for (let index = 0; index < uncheckedSignatureMessages.length; index++) {
     const unchecked = uncheckedSignatureMessages[index];
     try {
+      // eslint-disable-next-line no-await-in-loop
       const valid = await verifySignature(
         unchecked.sender,
         unchecked.base64EncodedData,
@@ -113,7 +114,7 @@ async function verifyAllSignatures(
         checked.push(unchecked.base64EncodedData);
         continue;
       }
-      // tslint:disable: no-console
+      // eslint:disable: no-console
       console.info('got an opengroup message with an invalid signature');
     } catch (e) {
       console.error(e);
@@ -244,7 +245,6 @@ async function EncryptAESGCM(symmetricKey: ArrayBuffer, plaintext: ArrayBuffer)
     plaintext
   );
 
-  // tslint:disable-next-line: restrict-plus-operands
   const ivAndCiphertext = new Uint8Array(NONCE_LENGTH + ciphertext.byteLength);
 
   ivAndCiphertext.set(nonce);
diff --git a/ts/window.d.ts b/ts/window.d.ts
index 2d467ccc3f..143e45d960 100644
--- a/ts/window.d.ts
+++ b/ts/window.d.ts
@@ -1,12 +1,9 @@
+// eslint-disable-next-line import/no-unresolved
 import {} from 'styled-components/cssprop';
 
-import { LocalizerType } from '../ts/types/Util';
+import { LocalizerType } from './types/Util';
 
-import { Store } from '@reduxjs/toolkit';
-
-import { ConversationCollection, ConversationModel } from './models/conversation';
-import { ConversationType } from './state/ducks/conversations';
-import { StateType } from './state/reducer';
+import { ConversationCollection } from './models/conversation';
 import { PrimaryColorStateType, ThemeStateType } from './themes/constants/colors';
 
 export interface LibTextsecure {
diff --git a/tslint.json b/tslint.json
deleted file mode 100644
index b0d7b49f01..0000000000
--- a/tslint.json
+++ /dev/null
@@ -1,99 +0,0 @@
-{
-  "defaultSeverity": "error",
-  "extends": ["tslint:recommended", "tslint-react", "tslint-microsoft-contrib"],
-  "jsRules": {},
-  "rules": {
-    "use-simple-attributes": false,
-    "align": false,
-    "newline-per-chained-call": false,
-    "array-type": [true, "generic"],
-    "arrow-parens": [true, "ban-single-arg-parens"],
-    "import-spacing": false,
-    "indent": [true, "spaces", 2],
-    "interface-name": [true, "never-prefix"],
-    "jsx-no-multiline-js": false,
-    "jsx-no-lambda": false,
-    "react-this-binding-issue": false,
-    "linebreak-style": [true, "LF"],
-    "max-line-length": false,
-    "mocha-avoid-only": true,
-    "mocha-no-side-effect-code": false,
-    "mocha-unneeded-done": true,
-    "no-angle-bracket-type-assertion": true,
-    "no-consecutive-blank-lines": [true, 2],
-    "no-submodule-imports": false,
-    "object-literal-key-quotes": [true, "as-needed"],
-    "object-literal-sort-keys": false,
-    "no-async-without-await": true,
-    "no-empty-interface": false,
-    "prefer-for-of": false,
-    "chai-vague-errors": false,
-    "no-useless-files": false,
-    "ordered-imports": false,
-    "quotemark": [true, "single", "jsx-double", "avoid-template", "avoid-escape"],
-    "semicolon": [true, "always", "ignore-bound-class-methods"],
-    "trailing-comma": [
-      true,
-      {
-        "singleline": "never",
-        "multiline": {
-          "objects": "always",
-          "arrays": "always",
-          "functions": "never",
-          "typeLiterals": "always"
-        },
-        "esSpecCompliant": true
-      }
-    ],
-    "variable-name": [true, "check-format", "allow-leading-underscore", "allow-pascal-case"],
-    "function-name": [
-      true,
-      {
-        "function-regex": "^(TEST_)?(_)?[a-z][\\w\\d]+$",
-        "method-regex": "^(TEST_)?(_)?[a-z][\\w\\d]+$",
-        "private-method-regex": "^(TEST_)?(_)?[a-z][\\w\\d]+$",
-        "protected-method-regex": "^(TEST_)?(_)?[a-z][\\w\\d]+$",
-        "static-method-regex": "^[a-zA-Z][\\w\\d]+$"
-      }
-    ],
-    "no-implicit-dependencies": [true, ["electron"]],
-    "completed-docs": false,
-    "export-name": false,
-    "no-any": false,
-    "no-increment-decrement": false,
-    "no-object-literal-type-assertion": false,
-    "no-relative-imports": false,
-    "no-unsafe-any": false,
-    "typedef": false,
-    "possible-timing-attack": false,
-    "no-null-keyword": false,
-    "import-name": false,
-    "missing-jsdoc": false,
-    "no-reserved-keywords": false,
-    "no-single-line-block-comment": false,
-    "no-use-before-declare": false,
-    "prefer-array-literal": false,
-    "prefer-method-signature": false,
-    "prefer-type-cast": false,
-    "strict-boolean-expressions": false,
-    "no-promise-as-boolean": true,
-    "await-promise": true,
-    "no-suspicious-comment": false,
-    "no-backbone-get-set-outside-model": false,
-    "underscore-consistent-invocation": false,
-    "newline-before-return": false,
-    "number-literal-format": false,
-    "no-unnecessary-local-variable": false,
-    "no-unnecessary-type-assertion": false,
-    "react-no-dangerous-html": [
-      true,
-      {
-        "file": "ts/components/session/SessionHTMLRenderer.tsx",
-        "method": "<unknown>",
-        "comment": "Usage has been approved by Maxim on 13 Dec 2019"
-      }
-    ],
-    "max-func-body-length": [true, 350]
-  },
-  "rulesDirectory": ["node_modules/tslint-microsoft-contrib"]
-}
diff --git a/utils.worker.config.js b/utils.worker.config.js
index bb892369a2..001dddb400 100644
--- a/utils.worker.config.js
+++ b/utils.worker.config.js
@@ -1,3 +1,4 @@
+// eslint-disable-next-line @typescript-eslint/no-var-requires
 const path = require('path');
 
 module.exports = {
diff --git a/yarn.lock b/yarn.lock
index f5aaaa9edc..746c9bcae3 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7,6 +7,11 @@
   resolved "https://registry.yarnpkg.com/7zip-bin/-/7zip-bin-5.1.1.tgz#9274ec7460652f9c632c59addf24efb1684ef876"
   integrity sha512-sAP4LldeWNz0lNzmTird3uWfFDWWTeg6V/MsmyyLR9X1idwKBWIgt/ZvinqQldJm3LecKEs1emkbquO6PCiLVQ==
 
+"@aashutoshrathi/word-wrap@^1.2.3":
+  version "1.2.6"
+  resolved "https://registry.yarnpkg.com/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz#bd9154aec9983f77b3a034ecaa015c2e4201f6cf"
+  integrity sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==
+
 "@ampproject/remapping@^2.1.0":
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.2.0.tgz#56c133824780de3174aed5ab6834f3026790154d"
@@ -535,34 +540,56 @@
   resolved "https://registry.yarnpkg.com/@emotion/unitless/-/unitless-0.7.5.tgz#77211291c1900a700b8a78cfafda3160d76949ed"
   integrity sha512-OWORNpfjMsSSUBVrRBVGECkhWcULOAJz9ZW8uK9qgxD+87M7jHRcvh/A96XXNhXTLmKcoYSQtBEX7lHMO7YRwg==
 
-"@eslint/eslintrc@^1.3.0":
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.3.0.tgz#29f92c30bb3e771e4a2048c95fa6855392dfac4f"
-  integrity sha512-UWW0TMTmk2d7hLcWD1/e2g5HDM/HQ3csaLSqXCfqwh4uNDuNqlaKWXmEsL4Cs41Z0KnILNvwbHAah3C2yt06kw==
+"@eslint-community/eslint-utils@^4.2.0", "@eslint-community/eslint-utils@^4.4.0":
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz#a23514e8fb9af1269d5f7788aa556798d61c6b59"
+  integrity sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==
+  dependencies:
+    eslint-visitor-keys "^3.3.0"
+
+"@eslint-community/regexpp@^4.4.0", "@eslint-community/regexpp@^4.5.1":
+  version "4.5.1"
+  resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.5.1.tgz#cdd35dce4fa1a89a4fd42b1599eb35b3af408884"
+  integrity sha512-Z5ba73P98O1KUYCCJTUeVpja9RcGoMdncZ6T49FCUl2lN38JtCJ+3WgIDBv0AuY4WChU5PmtJmOCTlN6FZTFKQ==
+
+"@eslint/eslintrc@^2.1.0":
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-2.1.0.tgz#82256f164cc9e0b59669efc19d57f8092706841d"
+  integrity sha512-Lj7DECXqIVCqnqjjHMPna4vn6GJcMgul/wuS0je9OZ9gsL0zzDpKPVtcG1HaDVc+9y+qgXneTeUMbCqXJNpH1A==
   dependencies:
     ajv "^6.12.4"
     debug "^4.3.2"
-    espree "^9.3.2"
-    globals "^13.15.0"
+    espree "^9.6.0"
+    globals "^13.19.0"
     ignore "^5.2.0"
     import-fresh "^3.2.1"
     js-yaml "^4.1.0"
     minimatch "^3.1.2"
     strip-json-comments "^3.1.1"
 
+"@eslint/js@8.44.0":
+  version "8.44.0"
+  resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.44.0.tgz#961a5903c74139390478bdc808bcde3fc45ab7af"
+  integrity sha512-Ag+9YM4ocKQx9AarydN0KY2j0ErMHNIocPDrVo8zAE44xLTjEtz81OdR68/cydGtk6m6jDb5Za3r2useMzYmSw==
+
 "@gar/promisify@^1.1.3":
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.3.tgz#555193ab2e3bb3b6adc3d551c9c030d9e860daf6"
   integrity sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==
 
-"@humanwhocodes/config-array@^0.9.2":
-  version "0.9.5"
-  resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.9.5.tgz#2cbaf9a89460da24b5ca6531b8bbfc23e1df50c7"
-  integrity sha512-ObyMyWxZiCu/yTisA7uzx81s40xR2fD5Cg/2Kq7G02ajkNubJf6BopgDTmDyc3U7sXpNKM8cYOw7s7Tyr+DnCw==
+"@humanwhocodes/config-array@^0.11.10":
+  version "0.11.10"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.10.tgz#5a3ffe32cc9306365fb3fd572596cd602d5e12d2"
+  integrity sha512-KVVjQmNUepDVGXNuoRRdmmEjruj0KfiGSbS8LVc12LMsWDQzRXJ0qdhN8L8uUigKpfEHRhlaQFY0ib1tnUbNeQ==
   dependencies:
     "@humanwhocodes/object-schema" "^1.2.1"
     debug "^4.1.1"
-    minimatch "^3.0.4"
+    minimatch "^3.0.5"
+
+"@humanwhocodes/module-importer@^1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz#af5b2691a22b44be847b0ca81641c5fb6ad0172c"
+  integrity sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==
 
 "@humanwhocodes/object-schema@^1.2.1":
   version "1.2.1"
@@ -671,6 +698,27 @@
     lodash "^4.17.15"
     tmp-promise "^3.0.2"
 
+"@nodelib/fs.scandir@2.1.5":
+  version "2.1.5"
+  resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5"
+  integrity sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==
+  dependencies:
+    "@nodelib/fs.stat" "2.0.5"
+    run-parallel "^1.1.9"
+
+"@nodelib/fs.stat@2.0.5", "@nodelib/fs.stat@^2.0.2":
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz#5bd262af94e9d25bd1e71b05deed44876a222e8b"
+  integrity sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==
+
+"@nodelib/fs.walk@^1.2.3", "@nodelib/fs.walk@^1.2.8":
+  version "1.2.8"
+  resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz#e95737e8bb6746ddedf69c556953494f196fe69a"
+  integrity sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==
+  dependencies:
+    "@nodelib/fs.scandir" "2.1.5"
+    fastq "^1.6.0"
+
 "@npmcli/fs@^2.1.0":
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/@npmcli/fs/-/fs-2.1.0.tgz#f2a21c28386e299d1a9fae8051d35ad180e33109"
@@ -1083,6 +1131,11 @@
   resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.11.tgz#d421b6c527a3037f7c84433fd2c4229e016863d3"
   integrity sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==
 
+"@types/json-schema@^7.0.12":
+  version "7.0.12"
+  resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.12.tgz#d70faba7039d5fca54c83c7dbab41051d2b6f6cb"
+  integrity sha512-Hr5Jfhc9eYOQNPYO5WLDq/n4jqijdHNlDXjuAQkkt+mWdQR+XJToOHrsD4cPaMXpn6KO7y2+wM8AZEs8VpBLVA==
+
 "@types/json5@^0.0.29":
   version "0.0.29"
   resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee"
@@ -1303,6 +1356,11 @@
   resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.3.9.tgz#152c6c20a7688c30b967ec1841d31ace569863fc"
   integrity sha512-L/TMpyURfBkf+o/526Zb6kd/tchUP3iBDEPjqjb+U2MAJhVRxxrmr2fwpe08E7QsV7YLcpq0tUaQ9O9x97ZIxQ==
 
+"@types/semver@^7.5.0":
+  version "7.5.0"
+  resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.5.0.tgz#591c1ce3a702c45ee15f47a42ade72c2fd78978a"
+  integrity sha512-G8hZ6XJiHnuhQKR7ZmysCeJWE08o8T0AXtk5darsCaTVsYZhhgUrq53jizaR2FvsoeCwJhlmwTjkXBY5Pn/ZHw==
+
 "@types/sinon@9.0.4":
   version "9.0.4"
   resolved "https://registry.yarnpkg.com/@types/sinon/-/sinon-9.0.4.tgz#e934f904606632287a6e7f7ab0ce3f08a0dad4b1"
@@ -1385,6 +1443,92 @@
   dependencies:
     "@types/node" "*"
 
+"@typescript-eslint/eslint-plugin@^6.1.0":
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.1.0.tgz#96f3ca6615717659d06c9f7161a1d14ab0c49c66"
+  integrity sha512-qg7Bm5TyP/I7iilGyp6DRqqkt8na00lI6HbjWZObgk3FFSzH5ypRwAHXJhJkwiRtTcfn+xYQIMOR5kJgpo6upw==
+  dependencies:
+    "@eslint-community/regexpp" "^4.5.1"
+    "@typescript-eslint/scope-manager" "6.1.0"
+    "@typescript-eslint/type-utils" "6.1.0"
+    "@typescript-eslint/utils" "6.1.0"
+    "@typescript-eslint/visitor-keys" "6.1.0"
+    debug "^4.3.4"
+    graphemer "^1.4.0"
+    ignore "^5.2.4"
+    natural-compare "^1.4.0"
+    natural-compare-lite "^1.4.0"
+    semver "^7.5.4"
+    ts-api-utils "^1.0.1"
+
+"@typescript-eslint/parser@^6.1.0":
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-6.1.0.tgz#3135bf65dca5340d8650703eb8cb83113e156ee5"
+  integrity sha512-hIzCPvX4vDs4qL07SYzyomamcs2/tQYXg5DtdAfj35AyJ5PIUqhsLf4YrEIFzZcND7R2E8tpQIZKayxg8/6Wbw==
+  dependencies:
+    "@typescript-eslint/scope-manager" "6.1.0"
+    "@typescript-eslint/types" "6.1.0"
+    "@typescript-eslint/typescript-estree" "6.1.0"
+    "@typescript-eslint/visitor-keys" "6.1.0"
+    debug "^4.3.4"
+
+"@typescript-eslint/scope-manager@6.1.0":
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-6.1.0.tgz#a6cdbe11630614f8c04867858a42dd56590796ed"
+  integrity sha512-AxjgxDn27hgPpe2rQe19k0tXw84YCOsjDJ2r61cIebq1t+AIxbgiXKvD4999Wk49GVaAcdJ/d49FYel+Pp3jjw==
+  dependencies:
+    "@typescript-eslint/types" "6.1.0"
+    "@typescript-eslint/visitor-keys" "6.1.0"
+
+"@typescript-eslint/type-utils@6.1.0":
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-6.1.0.tgz#21cc6c3bc1980b03f9eb4e64580d0c5be6f08215"
+  integrity sha512-kFXBx6QWS1ZZ5Ni89TyT1X9Ag6RXVIVhqDs0vZE/jUeWlBv/ixq2diua6G7ece6+fXw3TvNRxP77/5mOMusx2w==
+  dependencies:
+    "@typescript-eslint/typescript-estree" "6.1.0"
+    "@typescript-eslint/utils" "6.1.0"
+    debug "^4.3.4"
+    ts-api-utils "^1.0.1"
+
+"@typescript-eslint/types@6.1.0":
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-6.1.0.tgz#2d607c62827bb416ada5c96ebfa2ef84e45a8dfa"
+  integrity sha512-+Gfd5NHCpDoHDOaU/yIF3WWRI2PcBRKKpP91ZcVbL0t5tQpqYWBs3z/GGhvU+EV1D0262g9XCnyqQh19prU0JQ==
+
+"@typescript-eslint/typescript-estree@6.1.0":
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-6.1.0.tgz#ea382f6482ba698d7e993a88ce5391ea7a66c33d"
+  integrity sha512-nUKAPWOaP/tQjU1IQw9sOPCDavs/iU5iYLiY/6u7gxS7oKQoi4aUxXS1nrrVGTyBBaGesjkcwwHkbkiD5eBvcg==
+  dependencies:
+    "@typescript-eslint/types" "6.1.0"
+    "@typescript-eslint/visitor-keys" "6.1.0"
+    debug "^4.3.4"
+    globby "^11.1.0"
+    is-glob "^4.0.3"
+    semver "^7.5.4"
+    ts-api-utils "^1.0.1"
+
+"@typescript-eslint/utils@6.1.0":
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-6.1.0.tgz#1641843792b4e3451cc692e2c73055df8b26f453"
+  integrity sha512-wp652EogZlKmQoMS5hAvWqRKplXvkuOnNzZSE0PVvsKjpexd/XznRVHAtrfHFYmqaJz0DFkjlDsGYC9OXw+OhQ==
+  dependencies:
+    "@eslint-community/eslint-utils" "^4.4.0"
+    "@types/json-schema" "^7.0.12"
+    "@types/semver" "^7.5.0"
+    "@typescript-eslint/scope-manager" "6.1.0"
+    "@typescript-eslint/types" "6.1.0"
+    "@typescript-eslint/typescript-estree" "6.1.0"
+    semver "^7.5.4"
+
+"@typescript-eslint/visitor-keys@6.1.0":
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-6.1.0.tgz#d2b84dff6b58944d3257ea03687e269a788c73be"
+  integrity sha512-yQeh+EXhquh119Eis4k0kYhj9vmFzNpbhM3LftWQVwqVjipCkwHBQOZutcYW+JVkjtTG9k8nrZU1UoNedPDd1A==
+  dependencies:
+    "@typescript-eslint/types" "6.1.0"
+    eslint-visitor-keys "^3.4.1"
+
 "@ungap/promise-all-settled@1.1.2":
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz#aa58042711d6e3275dd37dc597e5d31e8c290a44"
@@ -1596,6 +1740,11 @@ acorn@^8.5.0, acorn@^8.7.1:
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.7.1.tgz#0197122c843d1bf6d0a5e83220a788f278f63c30"
   integrity sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A==
 
+acorn@^8.9.0:
+  version "8.10.0"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.10.0.tgz#8be5b3907a67221a81ab23c7889c4c5526b62ec5"
+  integrity sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==
+
 add-dom-event-listener@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/add-dom-event-listener/-/add-dom-event-listener-1.1.0.tgz#6a92db3a0dd0abc254e095c0f1dc14acbbaae310"
@@ -1840,6 +1989,11 @@ array-includes@^3.1.6:
     get-intrinsic "^1.1.3"
     is-string "^1.0.7"
 
+array-union@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d"
+  integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==
+
 array.prototype.flat@^1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.3.1.tgz#ffc6576a7ca3efc2f46a143b9d1dda9b4b3cf5e2"
@@ -1860,6 +2014,17 @@ array.prototype.flatmap@^1.3.1:
     es-abstract "^1.20.4"
     es-shim-unscopables "^1.0.0"
 
+array.prototype.tosorted@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/array.prototype.tosorted/-/array.prototype.tosorted-1.1.1.tgz#ccf44738aa2b5ac56578ffda97c03fd3e23dd532"
+  integrity sha512-pZYPXPRl2PqWcsUs6LOMn+1f1532nEoPTYowBtqLwAW+W8vSVhkIGnmOX1t/UQjD6YGI0vcD2B1U7ZFGQH9jnQ==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.1.4"
+    es-abstract "^1.20.4"
+    es-shim-unscopables "^1.0.0"
+    get-intrinsic "^1.1.3"
+
 arraybuffer.prototype.slice@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.1.tgz#9b5ea3868a6eebc30273da577eb888381c0044bb"
@@ -2232,11 +2397,6 @@ builder-util@23.6.0:
     stat-mode "^1.0.0"
     temp-file "^3.4.0"
 
-builtin-modules@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f"
-  integrity sha512-wxXCdllwGhI2kCC0MnvTGYTMvnVZTvqgypkiTI8Pa5tcz2i6VqsqwYGgqwXji+4RgCzms6EajE4IxiUH6HH8nQ==
-
 bunyan@^1.8.15:
   version "1.8.15"
   resolved "https://registry.yarnpkg.com/bunyan/-/bunyan-1.8.15.tgz#8ce34ca908a17d0776576ca1b2f6cbd916e93b46"
@@ -2375,7 +2535,7 @@ chalk@^1.1.3:
     strip-ansi "^3.0.0"
     supports-color "^2.0.0"
 
-chalk@^2.0.0, chalk@^2.3.0, chalk@^2.4.2:
+chalk@^2.0.0, chalk@^2.4.2:
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
   integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
@@ -2606,7 +2766,7 @@ commander@2.9.0:
   dependencies:
     graceful-readlink ">= 1.0.0"
 
-commander@^2.12.1, commander@^2.20.0:
+commander@^2.20.0:
   version "2.20.3"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
   integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
@@ -3010,11 +3170,6 @@ diff@5.0.0:
   resolved "https://registry.yarnpkg.com/diff/-/diff-5.0.0.tgz#7ed6ad76d859d030787ec35855f5b1daf31d852b"
   integrity sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w==
 
-diff@^3.2.0:
-  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12"
-  integrity sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==
-
 diff@^4.0.2:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz#60f3aecb89d5fae520c11aa19efc2bb982aade7d"
@@ -3030,6 +3185,13 @@ dir-compare@^2.4.0:
     commander "2.9.0"
     minimatch "3.0.4"
 
+dir-glob@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f"
+  integrity sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==
+  dependencies:
+    path-type "^4.0.0"
+
 dmg-builder@23.0.8:
   version "23.0.8"
   resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-23.0.8.tgz#c68d9811da8d1891e6121c1e0807635519856800"
@@ -3651,6 +3813,32 @@ eslint-plugin-more@^1.0.5:
   resolved "https://registry.yarnpkg.com/eslint-plugin-more/-/eslint-plugin-more-1.0.5.tgz#667bffc2a64bde2d48b98c8faa111e213b2f873f"
   integrity sha512-zjDza5jeNBHWf8ZezyW2Llk99abndcGlSz9GIKgVOGwISx0m+f4QoZAapjSmUjKSxHvmOa7Lt68Pk8XbRzWb7w==
 
+eslint-plugin-react-hooks@^4.6.0:
+  version "4.6.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.6.0.tgz#4c3e697ad95b77e93f8646aaa1630c1ba607edd3"
+  integrity sha512-oFc7Itz9Qxh2x4gNHStv3BqJq54ExXmfC+a1NjAta66IAN87Wu0R/QArgIS9qKzX3dXKPI9H5crl9QchNMY9+g==
+
+eslint-plugin-react@^7.33.0:
+  version "7.33.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.33.0.tgz#6c356fb0862fec2cd1b04426c669ea746e9b6eb3"
+  integrity sha512-qewL/8P34WkY8jAqdQxsiL82pDUeT7nhs8IsuXgfgnsEloKCT4miAV9N9kGtx7/KM9NH/NCGUE7Edt9iGxLXFw==
+  dependencies:
+    array-includes "^3.1.6"
+    array.prototype.flatmap "^1.3.1"
+    array.prototype.tosorted "^1.1.1"
+    doctrine "^2.1.0"
+    estraverse "^5.3.0"
+    jsx-ast-utils "^2.4.1 || ^3.0.0"
+    minimatch "^3.1.2"
+    object.entries "^1.1.6"
+    object.fromentries "^2.0.6"
+    object.hasown "^1.1.2"
+    object.values "^1.1.6"
+    prop-types "^15.8.1"
+    resolve "^2.0.0-next.4"
+    semver "^6.3.1"
+    string.prototype.matchall "^4.0.8"
+
 eslint-scope@5.1.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c"
@@ -3659,10 +3847,10 @@ eslint-scope@5.1.1:
     esrecurse "^4.3.0"
     estraverse "^4.1.1"
 
-eslint-scope@^7.1.1:
-  version "7.1.1"
-  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.1.1.tgz#fff34894c2f65e5226d3041ac480b4513a163642"
-  integrity sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==
+eslint-scope@^7.2.0:
+  version "7.2.1"
+  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.2.1.tgz#936821d3462675f25a18ac5fd88a67cc15b393bd"
+  integrity sha512-CvefSOsDdaYYvxChovdrPo/ZGt8d5lrJWleAc1diXRKhHGiTYEI26cvo8Kle/wGnsizoCJjK73FMg1/IkIwiNA==
   dependencies:
     esrecurse "^4.3.0"
     estraverse "^5.2.0"
@@ -3684,65 +3872,72 @@ eslint-visitor-keys@^3.3.0:
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz#f6480fa6b1f30efe2d1968aa8ac745b862469826"
   integrity sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==
 
-eslint@^8.15.0:
-  version "8.16.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.16.0.tgz#6d936e2d524599f2a86c708483b4c372c5d3bbae"
-  integrity sha512-MBndsoXY/PeVTDJeWsYj7kLZ5hQpJOfMYLsF6LicLHQWbRDG19lK5jOix4DPl8yY4SUFcE3txy86OzFLWT+yoA==
-  dependencies:
-    "@eslint/eslintrc" "^1.3.0"
-    "@humanwhocodes/config-array" "^0.9.2"
+eslint-visitor-keys@^3.4.1:
+  version "3.4.1"
+  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.1.tgz#c22c48f48942d08ca824cc526211ae400478a994"
+  integrity sha512-pZnmmLwYzf+kWaM/Qgrvpen51upAktaaiI01nsJD/Yr3lMOdNtq0cxkrrg16w64VtisN6okbs7Q8AfGqj4c9fA==
+
+eslint@^8.45.0:
+  version "8.45.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.45.0.tgz#bab660f90d18e1364352c0a6b7c6db8edb458b78"
+  integrity sha512-pd8KSxiQpdYRfYa9Wufvdoct3ZPQQuVuU5O6scNgMuOMYuxvH0IGaYK0wUFjo4UYYQQCUndlXiMbnxopwvvTiw==
+  dependencies:
+    "@eslint-community/eslint-utils" "^4.2.0"
+    "@eslint-community/regexpp" "^4.4.0"
+    "@eslint/eslintrc" "^2.1.0"
+    "@eslint/js" "8.44.0"
+    "@humanwhocodes/config-array" "^0.11.10"
+    "@humanwhocodes/module-importer" "^1.0.1"
+    "@nodelib/fs.walk" "^1.2.8"
     ajv "^6.10.0"
     chalk "^4.0.0"
     cross-spawn "^7.0.2"
     debug "^4.3.2"
     doctrine "^3.0.0"
     escape-string-regexp "^4.0.0"
-    eslint-scope "^7.1.1"
-    eslint-utils "^3.0.0"
-    eslint-visitor-keys "^3.3.0"
-    espree "^9.3.2"
-    esquery "^1.4.0"
+    eslint-scope "^7.2.0"
+    eslint-visitor-keys "^3.4.1"
+    espree "^9.6.0"
+    esquery "^1.4.2"
     esutils "^2.0.2"
     fast-deep-equal "^3.1.3"
     file-entry-cache "^6.0.1"
-    functional-red-black-tree "^1.0.1"
-    glob-parent "^6.0.1"
-    globals "^13.15.0"
+    find-up "^5.0.0"
+    glob-parent "^6.0.2"
+    globals "^13.19.0"
+    graphemer "^1.4.0"
     ignore "^5.2.0"
-    import-fresh "^3.0.0"
     imurmurhash "^0.1.4"
     is-glob "^4.0.0"
+    is-path-inside "^3.0.3"
     js-yaml "^4.1.0"
     json-stable-stringify-without-jsonify "^1.0.1"
     levn "^0.4.1"
     lodash.merge "^4.6.2"
     minimatch "^3.1.2"
     natural-compare "^1.4.0"
-    optionator "^0.9.1"
-    regexpp "^3.2.0"
+    optionator "^0.9.3"
     strip-ansi "^6.0.1"
-    strip-json-comments "^3.1.0"
     text-table "^0.2.0"
-    v8-compile-cache "^2.0.3"
 
-espree@^9.3.2:
-  version "9.3.2"
-  resolved "https://registry.yarnpkg.com/espree/-/espree-9.3.2.tgz#f58f77bd334731182801ced3380a8cc859091596"
-  integrity sha512-D211tC7ZwouTIuY5x9XnS0E9sWNChB7IYKX/Xp5eQj3nFXhqmiUDB9q27y76oFl8jTg3pXcQx/bpxMfs3CIZbA==
+espree@^9.6.0:
+  version "9.6.1"
+  resolved "https://registry.yarnpkg.com/espree/-/espree-9.6.1.tgz#a2a17b8e434690a5432f2f8018ce71d331a48c6f"
+  integrity sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==
   dependencies:
-    acorn "^8.7.1"
+    acorn "^8.9.0"
     acorn-jsx "^5.3.2"
-    eslint-visitor-keys "^3.3.0"
+    eslint-visitor-keys "^3.4.1"
 
 esprima@^4.0.0, esprima@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
   integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
 
-esquery@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.4.0.tgz#2148ffc38b82e8c7057dfed48425b3e61f0f24a5"
-  integrity sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==
+esquery@^1.4.2:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.5.0.tgz#6ce17738de8577694edd7361c57182ac8cb0db0b"
+  integrity sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==
   dependencies:
     estraverse "^5.1.0"
 
@@ -3758,7 +3953,7 @@ estraverse@^4.1.1:
   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d"
   integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==
 
-estraverse@^5.1.0, estraverse@^5.2.0:
+estraverse@^5.1.0, estraverse@^5.2.0, estraverse@^5.3.0:
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.3.0.tgz#2eea5290702f26ab8fe5370370ff86c965d21123"
   integrity sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==
@@ -3826,6 +4021,17 @@ fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
   integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
 
+fast-glob@^3.2.9:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.3.0.tgz#7c40cb491e1e2ed5664749e87bfb516dbe8727c0"
+  integrity sha512-ChDuvbOypPuNjO8yIDf36x7BlZX1smcUMTTcyoIjycexOxd6DFsKsg21qVBzEmr3G7fUKIRy2/psii+CIUt7FA==
+  dependencies:
+    "@nodelib/fs.stat" "^2.0.2"
+    "@nodelib/fs.walk" "^1.2.3"
+    glob-parent "^5.1.2"
+    merge2 "^1.3.0"
+    micromatch "^4.0.4"
+
 fast-json-stable-stringify@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633"
@@ -3851,6 +4057,13 @@ fastest-stable-stringify@^2.0.2:
   resolved "https://registry.yarnpkg.com/fastest-stable-stringify/-/fastest-stable-stringify-2.0.2.tgz#3757a6774f6ec8de40c4e86ec28ea02417214c76"
   integrity sha512-bijHueCGd0LqqNK9b5oCMHc0MluJAx0cwqASgbWMvkO01lCYgIhacVRLcaDz3QnyYIRNJRDwMb41VuT6pHJ91Q==
 
+fastq@^1.6.0:
+  version "1.15.0"
+  resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.15.0.tgz#d04d07c6a2a68fe4599fea8d2e103a937fae6b3a"
+  integrity sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==
+  dependencies:
+    reusify "^1.0.4"
+
 fd-slicer@~1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.1.0.tgz#25c7c89cb1f9077f8891bbe61d8f390eae256f1e"
@@ -3911,7 +4124,7 @@ find-cache-dir@^3.2.0:
     make-dir "^3.0.2"
     pkg-dir "^4.1.0"
 
-find-up@5.0.0:
+find-up@5.0.0, find-up@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz#4c92819ecb7083561e4f4a240a86be5198f536fc"
   integrity sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==
@@ -4079,11 +4292,6 @@ function.prototype.name@^1.1.5:
     es-abstract "^1.19.0"
     functions-have-names "^1.2.2"
 
-functional-red-black-tree@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"
-  integrity sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=
-
 functions-have-names@^1.2.2, functions-have-names@^1.2.3:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.3.tgz#0404fe4ee2ba2f607f0e0ec3c80bae994133b834"
@@ -4162,7 +4370,7 @@ getobject@^1.0.0:
   resolved "https://registry.yarnpkg.com/getobject/-/getobject-1.1.1.tgz#29f7858609fee7ef1c58d062f1b2335e425bdb45"
   integrity sha512-Rftr+NsUMxFcCmFopFmyCCfsJPaqUmf7TW61CtKMu0aE93ir62I6VjXt2koiCQgcunGgVog/U6g24tBPq67rlg==
 
-glob-parent@^6.0.1, glob-parent@~5.1.2:
+glob-parent@^5.1.2, glob-parent@^6.0.1, glob-parent@^6.0.2, glob-parent@~5.1.2:
   version "6.0.2"
   resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-6.0.2.tgz#6d237d99083950c79290f24c7642a3de9a28f9e3"
   integrity sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==
@@ -4209,7 +4417,7 @@ glob@^6.0.1:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@^7.0.5, glob@^7.1.1, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6:
+glob@^7.0.5, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6:
   version "7.2.3"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b"
   integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==
@@ -4256,10 +4464,10 @@ globals@^11.1.0:
   resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
   integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==
 
-globals@^13.15.0:
-  version "13.15.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-13.15.0.tgz#38113218c907d2f7e98658af246cef8b77e90bac"
-  integrity sha512-bpzcOlgDhMG070Av0Vy5Owklpv1I6+j96GhUI7Rh7IzDCKLzboflLrrfqMu8NquDbiR4EOQk7XzJwqVJxicxog==
+globals@^13.19.0:
+  version "13.20.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-13.20.0.tgz#ea276a1e508ffd4f1612888f9d1bad1e2717bf82"
+  integrity sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==
   dependencies:
     type-fest "^0.20.2"
 
@@ -4270,6 +4478,18 @@ globalthis@^1.0.1, globalthis@^1.0.3:
   dependencies:
     define-properties "^1.1.3"
 
+globby@^11.1.0:
+  version "11.1.0"
+  resolved "https://registry.yarnpkg.com/globby/-/globby-11.1.0.tgz#bd4be98bb042f83d796f7e3811991fbe82a0d34b"
+  integrity sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==
+  dependencies:
+    array-union "^2.1.0"
+    dir-glob "^3.0.1"
+    fast-glob "^3.2.9"
+    ignore "^5.2.0"
+    merge2 "^1.4.1"
+    slash "^3.0.0"
+
 gopd@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/gopd/-/gopd-1.0.1.tgz#29ff76de69dac7489b7c0918a5788e56477c332c"
@@ -4304,6 +4524,11 @@ graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6
   resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725"
   integrity sha512-8tLu60LgxF6XpdbK8OW3FA+IfTNBn1ZHGHKF4KQbEeSkajYw5PlYJcKluntgegDPTg8UkHjpet1T82vk6TQ68w==
 
+graphemer@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/graphemer/-/graphemer-1.4.0.tgz#fb2f1d55e0e3a1849aeffc90c4fa0dd53a0e66c6"
+  integrity sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==
+
 has-ansi@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91"
@@ -4490,6 +4715,11 @@ ignore@^5.2.0:
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.0.tgz#6d3bac8fa7fe0d45d9f9be7bac2fc279577e345a"
   integrity sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==
 
+ignore@^5.2.4:
+  version "5.2.4"
+  resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.4.tgz#a291c0c6178ff1b960befe47fcdec301674a6324"
+  integrity sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==
+
 image-type@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/image-type/-/image-type-4.1.0.tgz#72a88d64ff5021371ed67b9a466442100be57cd1"
@@ -4507,7 +4737,7 @@ immutable@^4.0.0:
   resolved "https://registry.yarnpkg.com/immutable/-/immutable-4.1.0.tgz#f795787f0db780183307b9eb2091fcac1f6fafef"
   integrity sha512-oNkuqVTA8jqG1Q6c+UglTOD1xhC1BtjKI7XkCXRkZHrN5m18/XsnUp8Q89GkQO/z+0WjonSvl0FLhDYftp46nQ==
 
-import-fresh@^3.0.0, import-fresh@^3.2.1:
+import-fresh@^3.2.1:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b"
   integrity sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==
@@ -4680,7 +4910,7 @@ is-ci@^3.0.0:
   dependencies:
     ci-info "^3.2.0"
 
-is-core-module@^2.11.0:
+is-core-module@^2.11.0, is-core-module@^2.9.0:
   version "2.12.1"
   resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.12.1.tgz#0c0b6885b6f80011c71541ce15c8d66cf5a4f9fd"
   integrity sha512-Q4ZuBAe2FUsKtyQJoQHlvP8OvBERxO3jEmy1I7hcRXcJBGGHFh/aJBswbXuS9sgrDH2QUO8ilkwNPHvHMd8clg==
@@ -4763,7 +4993,7 @@ is-obj@^2.0.0:
   resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-2.0.0.tgz#473fb05d973705e3fd9620545018ca8e22ef4982"
   integrity sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==
 
-is-path-inside@^3.0.2:
+is-path-inside@^3.0.2, is-path-inside@^3.0.3:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283"
   integrity sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==
@@ -5150,6 +5380,16 @@ jsonfile@^6.0.1:
   optionalDependencies:
     graceful-fs "^4.1.6"
 
+"jsx-ast-utils@^2.4.1 || ^3.0.0":
+  version "3.3.4"
+  resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-3.3.4.tgz#b896535fed5b867650acce5a9bd4135ffc7b3bf9"
+  integrity sha512-fX2TVdCViod6HwKEtSWGHs57oFhVfCMwieb9PuRDgjDPh5XeqJiHFFFJCHxU5cnTc3Bu/GRL+kPiFmw8XWOfKw==
+  dependencies:
+    array-includes "^3.1.6"
+    array.prototype.flat "^1.3.1"
+    object.assign "^4.1.4"
+    object.values "^1.1.6"
+
 just-extend@^4.0.2:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/just-extend/-/just-extend-4.2.1.tgz#ef5e589afb61e5d66b24eca749409a8939a8c744"
@@ -5449,6 +5689,11 @@ merge-stream@^2.0.0:
   resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60"
   integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==
 
+merge2@^1.3.0, merge2@^1.4.1:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae"
+  integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==
+
 mic-recorder-to-mp3@^2.2.2:
   version "2.2.2"
   resolved "https://registry.yarnpkg.com/mic-recorder-to-mp3/-/mic-recorder-to-mp3-2.2.2.tgz#32e767d1196fb81d10e279f31c304350c9501d01"
@@ -5569,18 +5814,18 @@ minizlib@^2.1.1, minizlib@^2.1.2:
     minipass "^3.0.0"
     yallist "^4.0.0"
 
-mkdirp@^0.5.1, mkdirp@~0.5.1:
+mkdirp@^1.0.3, mkdirp@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
+  integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
+
+mkdirp@~0.5.1:
   version "0.5.6"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.6.tgz#7def03d2432dcae4ba1d611445c48396062255f6"
   integrity sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==
   dependencies:
     minimist "^1.2.6"
 
-mkdirp@^1.0.3, mkdirp@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
-  integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
-
 mocha@10.0.0:
   version "10.0.0"
   resolved "https://registry.yarnpkg.com/mocha/-/mocha-10.0.0.tgz#205447d8993ec755335c4b13deba3d3a13c4def9"
@@ -5672,6 +5917,11 @@ nanoid@^3.3.4:
   resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.4.tgz#730b67e3cd09e2deacf03c027c81c9d9dbc5e8ab"
   integrity sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==
 
+natural-compare-lite@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/natural-compare-lite/-/natural-compare-lite-1.4.0.tgz#17b09581988979fddafe0201e931ba933c96cbb4"
+  integrity sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g==
+
 natural-compare@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
@@ -5886,6 +6136,32 @@ object.entries@^1.1.5:
     define-properties "^1.1.3"
     es-abstract "^1.19.1"
 
+object.entries@^1.1.6:
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.6.tgz#9737d0e5b8291edd340a3e3264bb8a3b00d5fa23"
+  integrity sha512-leTPzo4Zvg3pmbQ3rDK69Rl8GQvIqMWubrkxONG9/ojtFE2rD9fjMKfSI5BxW3osRH1m6VdzmqK8oAY9aT4x5w==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.1.4"
+    es-abstract "^1.20.4"
+
+object.fromentries@^2.0.6:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.6.tgz#cdb04da08c539cffa912dcd368b886e0904bfa73"
+  integrity sha512-VciD13dswC4j1Xt5394WR4MzmAQmlgN72phd/riNp9vtD7tp4QQWJ0R4wvclXcafgcYK8veHRed2W6XeGBvcfg==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.1.4"
+    es-abstract "^1.20.4"
+
+object.hasown@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/object.hasown/-/object.hasown-1.1.2.tgz#f919e21fad4eb38a57bc6345b3afd496515c3f92"
+  integrity sha512-B5UIT3J1W+WuWIU55h0mjlwaqxiE5vYENJXIXZ4VFe05pNYrkKuK0U/6aFcb0pKywYJh7IhfoqUfKVmrJJHZHw==
+  dependencies:
+    define-properties "^1.1.4"
+    es-abstract "^1.20.4"
+
 object.values@^1.1.6:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.6.tgz#4abbaa71eba47d63589d402856f908243eea9b1d"
@@ -5938,17 +6214,17 @@ optionator@^0.8.1:
     type-check "~0.3.2"
     word-wrap "~1.2.3"
 
-optionator@^0.9.1:
-  version "0.9.1"
-  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.1.tgz#4f236a6373dae0566a6d43e1326674f50c291499"
-  integrity sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==
+optionator@^0.9.3:
+  version "0.9.3"
+  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.3.tgz#007397d44ed1872fdc6ed31360190f81814e2c64"
+  integrity sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==
   dependencies:
+    "@aashutoshrathi/word-wrap" "^1.2.3"
     deep-is "^0.1.3"
     fast-levenshtein "^2.0.6"
     levn "^0.4.1"
     prelude-ls "^1.2.1"
     type-check "^0.4.0"
-    word-wrap "^1.2.3"
 
 os-homedir@1.0.2:
   version "1.0.2"
@@ -6423,6 +6699,11 @@ qr.js@0.0.0:
   resolved "https://registry.yarnpkg.com/qr.js/-/qr.js-0.0.0.tgz#cace86386f59a0db8050fa90d9b6b0e88a1e364f"
   integrity sha1-ys6GOG9ZoNuAUPqQ2baw6IoeNk8=
 
+queue-microtask@^1.2.2:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243"
+  integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==
+
 queue-promise@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/queue-promise/-/queue-promise-2.2.1.tgz#8de03fb79ba458efcb5ebf76368ab029d2669752"
@@ -6802,11 +7083,6 @@ regexp.prototype.flags@^1.5.0:
     define-properties "^1.2.0"
     functions-have-names "^1.2.3"
 
-regexpp@^3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.2.0.tgz#0425a2768d8f23bad70ca4b90461fa2f1213e1b2"
-  integrity sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==
-
 registry-auth-token@^4.0.0:
   version "4.2.2"
   resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-4.2.2.tgz#f02d49c3668884612ca031419491a13539e21fac"
@@ -6875,7 +7151,7 @@ resolve-from@^5.0.0:
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69"
   integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==
 
-resolve@^1.20.0, resolve@^1.3.2:
+resolve@^1.20.0:
   version "1.22.0"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.0.tgz#5e0b8c67c15df57a89bdbabe603a002f21731198"
   integrity sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==
@@ -6893,6 +7169,15 @@ resolve@^1.22.1:
     path-parse "^1.0.7"
     supports-preserve-symlinks-flag "^1.0.0"
 
+resolve@^2.0.0-next.4:
+  version "2.0.0-next.4"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-2.0.0-next.4.tgz#3d37a113d6429f496ec4752d2a2e58efb1fd4660"
+  integrity sha512-iMDbmAWtfU+MHpxt/I5iWI7cY6YVEZUQ3MBgPQ++XD1PELuJHIl82xBmObyP2KyQmkNB2dsqF7seoQQiAn5yDQ==
+  dependencies:
+    is-core-module "^2.9.0"
+    path-parse "^1.0.7"
+    supports-preserve-symlinks-flag "^1.0.0"
+
 responselike@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/responselike/-/responselike-2.0.1.tgz#9a0bc8fdc252f3fb1cca68b016591059ba1422bc"
@@ -6910,6 +7195,11 @@ retry@^0.13.1:
   resolved "https://registry.yarnpkg.com/retry/-/retry-0.13.1.tgz#185b1587acf67919d63b357349e03537b2484658"
   integrity sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg==
 
+reusify@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76"
+  integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==
+
 rimraf@2.6.2:
   version "2.6.2"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36"
@@ -6957,6 +7247,13 @@ rtl-css-js@^1.14.0:
   dependencies:
     "@babel/runtime" "^7.1.2"
 
+run-parallel@^1.1.9:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.2.0.tgz#66d1368da7bdf921eb9d95bd1a9229e7f21a43ee"
+  integrity sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==
+  dependencies:
+    queue-microtask "^1.2.2"
+
 run-script-os@^1.1.6:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/run-script-os/-/run-script-os-1.1.6.tgz#8b0177fb1b54c99a670f95c7fdc54f18b9c72347"
@@ -7098,7 +7395,7 @@ semver@5.4.1:
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.4.1.tgz#e059c09d8571f0540823733433505d3a2f00b18e"
   integrity sha512-WfG/X9+oATh81XtllIo/I8gOiY9EXRdv1cQdyykeXK17YcUW3EXUAi2To4pcH6nZtJPr7ZOpM5OMyWJZm+8Rsg==
 
-semver@^5.3.0, semver@^5.5.0, semver@^5.6.0:
+semver@^5.5.0, semver@^5.6.0:
   version "5.7.1"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
   integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
@@ -7108,12 +7405,12 @@ semver@^6.0.0, semver@^6.3.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
   integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
 
-semver@^6.2.0:
+semver@^6.2.0, semver@^6.3.1:
   version "6.3.1"
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
   integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
 
-semver@^7.3.2:
+semver@^7.3.2, semver@^7.5.4:
   version "7.5.4"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e"
   integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==
@@ -7391,6 +7688,20 @@ stat-mode@^1.0.0:
     is-fullwidth-code-point "^3.0.0"
     strip-ansi "^6.0.1"
 
+string.prototype.matchall@^4.0.8:
+  version "4.0.8"
+  resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.8.tgz#3bf85722021816dcd1bf38bb714915887ca79fd3"
+  integrity sha512-6zOCOcJ+RJAQshcTvXPHoxoQGONa3e/Lqx90wUA+wEzX78sg5Bo+1tQo4N0pohS0erG9qtCqJDjNCQBjeWVxyg==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.1.4"
+    es-abstract "^1.20.4"
+    get-intrinsic "^1.1.3"
+    has-symbols "^1.0.3"
+    internal-slot "^1.0.3"
+    regexp.prototype.flags "^1.4.3"
+    side-channel "^1.0.4"
+
 string.prototype.trim@^1.2.7:
   version "1.2.7"
   resolved "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.2.7.tgz#a68352740859f6893f14ce3ef1bb3037f7a90533"
@@ -7472,7 +7783,7 @@ strip-final-newline@^2.0.0:
   resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad"
   integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==
 
-strip-json-comments@3.1.1, strip-json-comments@^3.1.0, strip-json-comments@^3.1.1:
+strip-json-comments@3.1.1, strip-json-comments@^3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
   integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==
@@ -7700,6 +8011,11 @@ truncate-utf8-bytes@^1.0.0:
   dependencies:
     utf8-byte-length "^1.0.1"
 
+ts-api-utils@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/ts-api-utils/-/ts-api-utils-1.0.1.tgz#8144e811d44c749cd65b2da305a032510774452d"
+  integrity sha512-lC/RGlPmwdrIBFTX59wwNzqh7aR2otPNPR/5brHZm/XKFYKsfqxihXUe9pU3JI+3vGkl+vyCoNNnPhJn3aLK1A==
+
 ts-easing@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/ts-easing/-/ts-easing-0.2.0.tgz#c8a8a35025105566588d87dbda05dd7fbfa5a4ec"
@@ -7730,63 +8046,11 @@ tsconfig-paths@^3.14.1:
     minimist "^1.2.6"
     strip-bom "^3.0.0"
 
-tslib@^1.8.0, tslib@^1.8.1:
-  version "1.14.1"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
-  integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
-
 tslib@^2.1.0:
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.4.0.tgz#7cecaa7f073ce680a05847aa77be941098f36dc3"
   integrity sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==
 
-tslint-microsoft-contrib@6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/tslint-microsoft-contrib/-/tslint-microsoft-contrib-6.0.0.tgz#7bff73c9ad7a0b7eb5cdb04906de58f42a2bf7a2"
-  integrity sha512-R//efwn+34IUjTJeYgNDAJdzG0jyLWIehygPt/PHuZAieTolFVS56FgeFW7DOLap9ghXzMiFPTmDgm54qaL7QA==
-  dependencies:
-    tsutils "^2.27.2 <2.29.0"
-
-tslint-react@3.6.0:
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/tslint-react/-/tslint-react-3.6.0.tgz#7f462c95c4a0afaae82507f06517ff02942196a1"
-  integrity sha512-AIv1QcsSnj7e9pFir6cJ6vIncTqxfqeFF3Lzh8SuuBljueYzEAtByuB6zMaD27BL0xhMEqsZ9s5eHuCONydjBw==
-  dependencies:
-    tsutils "^2.13.1"
-
-tslint@5.19.0:
-  version "5.19.0"
-  resolved "https://registry.yarnpkg.com/tslint/-/tslint-5.19.0.tgz#a2cbd4a7699386da823f6b499b8394d6c47bb968"
-  integrity sha512-1LwwtBxfRJZnUvoS9c0uj8XQtAnyhWr9KlNvDIdB+oXyT+VpsOAaEhEgKi1HrZ8rq0ki/AAnbGSv4KM6/AfVZw==
-  dependencies:
-    "@babel/code-frame" "^7.0.0"
-    builtin-modules "^1.1.1"
-    chalk "^2.3.0"
-    commander "^2.12.1"
-    diff "^3.2.0"
-    glob "^7.1.1"
-    js-yaml "^3.13.1"
-    minimatch "^3.0.4"
-    mkdirp "^0.5.1"
-    resolve "^1.3.2"
-    semver "^5.3.0"
-    tslib "^1.8.0"
-    tsutils "^2.29.0"
-
-tsutils@^2.13.1, tsutils@^2.29.0:
-  version "2.29.0"
-  resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-2.29.0.tgz#32b488501467acbedd4b85498673a0812aca0b99"
-  integrity sha512-g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA==
-  dependencies:
-    tslib "^1.8.1"
-
-"tsutils@^2.27.2 <2.29.0":
-  version "2.28.0"
-  resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-2.28.0.tgz#6bd71e160828f9d019b6f4e844742228f85169a1"
-  integrity sha512-bh5nAtW0tuhvOJnx1GLRn5ScraRLICGyJV5wJhtRWOLsxW70Kk5tZtpK3O/hW6LDnqKS9mlUMPZj9fEMJ0gxqA==
-  dependencies:
-    tslib "^1.8.1"
-
 type-check@^0.4.0, type-check@~0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1"
@@ -7867,10 +8131,10 @@ typedarray-to-buffer@^3.1.5:
   dependencies:
     is-typedarray "^1.0.0"
 
-typescript@^4.6.3:
-  version "4.6.4"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.6.4.tgz#caa78bbc3a59e6a5c510d35703f6a09877ce45e9"
-  integrity sha512-9ia/jWHIEbo49HfjrLGfKbZSuWo9iTMwXO+Ca3pRsSpbsMbc7/IU8NKdCZVRRBafVPGnoJeFL76ZOAA84I9fEg==
+typescript@^5.1.6:
+  version "5.1.6"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.1.6.tgz#02f8ac202b6dad2c0dd5e0913745b47a37998274"
+  integrity sha512-zaWCozRZ6DLEWAWFrVDz1H6FVXzUSfTy5FUMWsQlU8Ym5JP9eO4xkTIROFCQvhQf61z6O/G6ugw3SgAnvvm+HA==
 
 uc.micro@^1.0.1:
   version "1.0.6"
@@ -7993,11 +8257,6 @@ uuid@8.3.2, uuid@^8.3.2:
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
   integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
 
-v8-compile-cache@^2.0.3:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz#2de19618c66dc247dcfb6f99338035d8245a2cee"
-  integrity sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==
-
 verror@^1.10.0:
   version "1.10.1"
   resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.1.tgz#4bf09eeccf4563b109ed4b3d458380c972b0cdeb"
@@ -8204,7 +8463,7 @@ wildcard@^2.0.0:
   resolved "https://registry.yarnpkg.com/wildcard/-/wildcard-2.0.0.tgz#a77d20e5200c6faaac979e4b3aadc7b3dd7f8fec"
   integrity sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw==
 
-word-wrap@^1.2.3, word-wrap@~1.2.3:
+word-wrap@~1.2.3:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
   integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==

From feaba36fa43acd027d909b1c0ae82f465a3b4654 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Wed, 26 Jul 2023 14:06:11 +0200
Subject: [PATCH 2/8] fix: picker emoji-mart errors after update

---
 .eslintrc.js                                  |  2 +-
 package.json                                  |  7 +-
 .../conversation/SessionEmojiPanel.tsx        |  7 +-
 .../leftpane/overlay/OverlayCommunity.tsx     |  2 +-
 ts/node/sql.ts                                |  6 +-
 .../sogsv3/sogsV3SendReaction.ts              | 10 +--
 ts/test/util/blockedNumberController_test.ts  |  2 +-
 ts/types/Reaction.ts                          | 67 +------------------
 ts/util/emoji.ts                              |  6 +-
 yarn.lock                                     | 31 ++++-----
 10 files changed, 34 insertions(+), 106 deletions(-)

diff --git a/.eslintrc.js b/.eslintrc.js
index 27afc3b430..6b9ace6d52 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -118,7 +118,7 @@ module.exports = {
     },
     {
       files: ['ts/node/**/*.ts', 'ts/test/**/*.ts'],
-      rules: { 'no-console': 'off' },
+      rules: { 'no-console': 'off', 'import/no-extraneous-dependencies': 'off' },
     },
   ],
 };
diff --git a/package.json b/package.json
index 40cae5167d..c6a941cb8b 100644
--- a/package.json
+++ b/package.json
@@ -71,8 +71,8 @@
     "worker:libsession": "rimraf 'ts/webworker/workers/node/libsession/*.node' && webpack  --config=./libsession.worker.config.js"
   },
   "dependencies": {
-    "@emoji-mart/data": "^1.0.6",
-    "@emoji-mart/react": "^1.0.1",
+    "@emoji-mart/data": "^1.1.2",
+    "@emoji-mart/react": "^1.1.1",
     "@reduxjs/toolkit": "1.8.5",
     "@signalapp/better-sqlite3": "^8.4.3",
     "@types/react-mentions": "^4.1.8",
@@ -93,7 +93,7 @@
     "dompurify": "^2.0.7",
     "electron-localshortcut": "^3.2.1",
     "electron-updater": "^4.2.2",
-    "emoji-mart": "^5.2.2",
+    "emoji-mart": "^5.5.2",
     "filesize": "3.6.1",
     "firstline": "1.2.1",
     "fs-extra": "9.0.0",
@@ -154,7 +154,6 @@
     "@types/config": "0.0.34",
     "@types/dompurify": "^2.0.0",
     "@types/electron-localshortcut": "^3.1.0",
-    "@types/emoji-mart": "3.0.9",
     "@types/filesize": "3.6.0",
     "@types/firstline": "^2.0.2",
     "@types/fs-extra": "5.0.5",
diff --git a/ts/components/conversation/SessionEmojiPanel.tsx b/ts/components/conversation/SessionEmojiPanel.tsx
index 11d0ac9e9d..c71af3d873 100644
--- a/ts/components/conversation/SessionEmojiPanel.tsx
+++ b/ts/components/conversation/SessionEmojiPanel.tsx
@@ -1,10 +1,10 @@
 import React, { forwardRef } from 'react';
 import classNames from 'classnames';
 import styled from 'styled-components';
-import Picker from '@emoji-mart/react';
 import { useSelector } from 'react-redux';
+import Picker from '@emoji-mart/react';
+
 import { getTheme, isDarkTheme } from '../../state/selectors/theme';
-import { FixedBaseEmoji, FixedPickerProps } from '../../types/Reaction';
 import {
   COLORS,
   ColorsType,
@@ -16,6 +16,7 @@ import {
 import { hexColorToRGB } from '../../util/hexColorToRGB';
 import { getPrimaryColor } from '../../state/selectors/primaryColor';
 import { i18nEmojiData } from '../../util/emoji';
+import { FixedBaseEmoji } from '../../types/Reaction';
 
 export const StyledEmojiPanel = styled.div<{
   isModal: boolean;
@@ -90,7 +91,7 @@ type Props = {
   onKeyDown?: (event: any) => void;
 };
 
-const pickerProps: FixedPickerProps = {
+const pickerProps = {
   title: '',
   showPreview: true,
   autoFocus: true,
diff --git a/ts/components/leftpane/overlay/OverlayCommunity.tsx b/ts/components/leftpane/overlay/OverlayCommunity.tsx
index 0939415068..f64d1b3fec 100644
--- a/ts/components/leftpane/overlay/OverlayCommunity.tsx
+++ b/ts/components/leftpane/overlay/OverlayCommunity.tsx
@@ -102,7 +102,7 @@ export const OverlayCommunity = () => {
       <SessionButton text={buttonText} disabled={!groupUrl} onClick={onTryJoinRoom} />
 
       <SessionSpinner loading={loading} />
-      <SessionJoinableRooms onJoinClick={() => void onTryJoinRoom()} alreadyJoining={loading} />
+      <SessionJoinableRooms onJoinClick={url => void onTryJoinRoom(url)} alreadyJoining={loading} />
     </div>
   );
 };
diff --git a/ts/node/sql.ts b/ts/node/sql.ts
index c94186f3b4..493339044f 100644
--- a/ts/node/sql.ts
+++ b/ts/node/sql.ts
@@ -637,13 +637,13 @@ function getPubkeysInPublicConversation(conversationId: string) {
       conversation.capabilities?.includes('blind')
   );
 
-  const whereClause = hasBlindOn ? 'AND source LIKE "15%"' : '';
+  const whereClause = hasBlindOn ? "AND source LIKE '15%'" : ''; // the LIKE content has to be ' and not "
 
   const rows = assertGlobalInstance()
     .prepare(
       `SELECT DISTINCT source FROM ${MESSAGES_TABLE} WHERE
-      conversationId = $conversationId ${whereClause}
-     ORDER BY received_at DESC LIMIT ${MAX_PUBKEYS_MEMBERS};`
+    conversationId = $conversationId ${whereClause}
+   ORDER BY received_at DESC LIMIT ${MAX_PUBKEYS_MEMBERS};`
     )
     .all({
       conversationId,
diff --git a/ts/session/apis/open_group_api/sogsv3/sogsV3SendReaction.ts b/ts/session/apis/open_group_api/sogsv3/sogsV3SendReaction.ts
index b85f2e88a0..e5628febd7 100644
--- a/ts/session/apis/open_group_api/sogsv3/sogsV3SendReaction.ts
+++ b/ts/session/apis/open_group_api/sogsv3/sogsV3SendReaction.ts
@@ -2,12 +2,7 @@ import { AbortSignal } from 'abort-controller';
 import { getEmojiDataFromNative } from 'emoji-mart';
 import { Data } from '../../../../data/data';
 import { ConversationModel } from '../../../../models/conversation';
-import {
-  Action,
-  FixedBaseEmoji,
-  OpenGroupReactionResponse,
-  Reaction,
-} from '../../../../types/Reaction';
+import { Action, OpenGroupReactionResponse, Reaction } from '../../../../types/Reaction';
 import { Reactions } from '../../../../util/reactions';
 import { OnionSending } from '../../../onions/onionSend';
 import { ToastUtils, UserUtils } from '../../../utils';
@@ -74,7 +69,8 @@ export const sendSogsReactionOnionV4 = async (
   // The SOGS endpoint supports any text input so we need to make sure we are sending a valid unicode emoji
   // for an invalid input we use https://emojipedia.org/frame-with-an-x/ as a replacement since it cannot rendered as an emoji but is valid unicode
   // NOTE emoji-mart v5.2.2 types for getEmojiDataFromNative are broken
-  const emoji = (getEmojiDataFromNative(reaction.emoji) as FixedBaseEmoji) ? reaction.emoji : '🖾';
+  // eslint-disable-next-line @typescript-eslint/await-thenable
+  const emoji = (await getEmojiDataFromNative(reaction.emoji)) ? reaction.emoji : '🖾';
   const endpoint = `/room/${room}/reaction/${reaction.id}/${emoji}`;
   const method = reaction.action === Action.REACT ? 'PUT' : 'DELETE';
   const serverPubkey = allValidRoomInfos[0].serverPublicKey;
diff --git a/ts/test/util/blockedNumberController_test.ts b/ts/test/util/blockedNumberController_test.ts
index fca76b8ae1..904a3d3a95 100644
--- a/ts/test/util/blockedNumberController_test.ts
+++ b/ts/test/util/blockedNumberController_test.ts
@@ -71,7 +71,7 @@ describe('BlockedNumberController', () => {
 
       const blockedNumbers = BlockedNumberController.getBlockedNumbers();
       expect(blockedNumbers.length).to.be.eq(0);
-      expect(Object.keys(memoryDB.blocked)).to.be.be.eq(0);
+      expect(Object.keys(memoryDB.blocked).length).to.be.be.eq(0);
     });
 
     it('should only unblock if a device was blocked', async () => {
diff --git a/ts/types/Reaction.ts b/ts/types/Reaction.ts
index f2ab687e27..4e0c7a465e 100644
--- a/ts/types/Reaction.ts
+++ b/ts/types/Reaction.ts
@@ -1,4 +1,4 @@
-import { EmojiSet, PartialI18n } from 'emoji-mart';
+import { Emoji, EmojiMartData } from '@emoji-mart/data';
 
 export const reactionLimit: number = 6;
 
@@ -30,14 +30,7 @@ export class RecentReactions {
   }
 }
 
-type BaseEmojiSkin = { unified: string; native: string };
-
-export interface FixedBaseEmoji {
-  id: string;
-  name: string;
-  keywords: Array<string>;
-  skins: Array<BaseEmojiSkin>;
-  version: number;
+export interface FixedBaseEmoji extends Emoji {
   search?: string;
   // props from emoji panel click event
   native?: string;
@@ -46,64 +39,10 @@ export interface FixedBaseEmoji {
   unified?: string;
 }
 
-export interface NativeEmojiData {
-  categories: Array<{ id: string; emojis: Array<string> }>;
-  emojis: Record<string, FixedBaseEmoji>;
-  aliases: Record<string, string>;
-  sheet: { cols: number; rows: number };
+export interface NativeEmojiData extends EmojiMartData {
   ariaLabels?: Record<string, string>;
 }
 
-// Types for EmojiMart 5 are currently broken these are a temporary fixes
-export interface FixedPickerProps {
-  autoFocus?: boolean | undefined;
-  title?: string | undefined;
-  theme?: 'auto' | 'light' | 'dark' | undefined;
-  perLine?: number | undefined;
-  stickySearch?: boolean | undefined;
-  searchPosition?: 'sticky' | 'static' | 'none' | undefined;
-  emojiButtonSize?: number | undefined;
-  emojiButtonRadius?: number | undefined;
-  emojiButtonColors?: string | undefined;
-  maxFrequentRows?: number | undefined;
-  icons?: 'auto' | 'outline' | 'solid';
-  set?: EmojiSet | undefined;
-  emoji?: string | undefined;
-  navPosition?: 'bottom' | 'top' | 'none' | undefined;
-  showPreview?: boolean | undefined;
-  previewEmoji?: boolean | undefined;
-  noResultsEmoji?: string | undefined;
-  previewPosition?: 'bottom' | 'top' | 'none' | undefined;
-  skinTonePosition?: 'preview' | 'search' | 'none';
-  i18n?: PartialI18n | undefined;
-  onEmojiSelect?: (emoji: FixedBaseEmoji) => void;
-  onClickOutside?: () => void;
-  onKeyDown?: (event: any) => void;
-  onAddCustomEmoji?: () => void;
-  getImageURL?: () => void;
-  getSpritesheetURL?: () => void;
-  // Below here I'm currently unsure of usage
-  // style?: React.CSSProperties | undefined;
-  // color?: string | undefined;
-  // skin?: EmojiSkin | undefined;
-  // defaultSkin?: EmojiSkin | undefined;
-  // backgroundImageFn?: BackgroundImageFn | undefined;
-  // sheetSize?: EmojiSheetSize | undefined;
-  // emojisToShowFilter?(emoji: EmojiData): boolean;
-  // showSkinTones?: boolean | undefined;
-  // emojiTooltip?: boolean | undefined;
-  // include?: CategoryName[] | undefined;
-  // exclude?: CategoryName[] | undefined;
-  // recent?: string[] | undefined;
-  // /** NOTE: custom emoji are copied into a singleton object on every new mount */
-  // custom?: CustomEmoji[] | undefined;
-  // skinEmoji?: string | undefined;
-  // notFound?(): React.Component;
-  // notFoundEmoji?: string | undefined;
-  // enableFrequentEmojiSort?: boolean | undefined;
-  // useButton?: boolean | undefined;
-}
-
 export enum Action {
   REACT = 0,
   REMOVE = 1,
diff --git a/ts/util/emoji.ts b/ts/util/emoji.ts
index 7892f2583c..209498b5fa 100644
--- a/ts/util/emoji.ts
+++ b/ts/util/emoji.ts
@@ -2,7 +2,7 @@
 /* eslint-disable no-continue */
 /* eslint-disable no-param-reassign */
 /* eslint-disable import/no-mutable-exports  */
-import { PartialI18n, init } from 'emoji-mart';
+import { init, I18n } from 'emoji-mart';
 import { FixedBaseEmoji, NativeEmojiData } from '../types/Reaction';
 import { loadEmojiPanelI18n } from './i18n';
 
@@ -47,7 +47,7 @@ export function getEmojiSizeClass(str: string): SizeClassType {
 }
 
 export let nativeEmojiData: NativeEmojiData | null = null;
-export let i18nEmojiData: PartialI18n | null = null;
+export let i18nEmojiData: typeof I18n | null = null;
 
 export async function initialiseEmojiData(data: any): Promise<void> {
   const ariaLabels: Record<string, string> = {};
@@ -85,7 +85,7 @@ export async function initialiseEmojiData(data: any): Promise<void> {
   i18nEmojiData = await loadEmojiPanelI18n();
   // Data needs to be initialised once per page load for the emoji components
   // See https://github.com/missive/emoji-mart#%EF%B8%8F%EF%B8%8F-headless-search
-  init({ data, i18n: i18nEmojiData });
+  await init({ data, i18n: i18nEmojiData });
 }
 
 // Synchronous version of Emoji Mart's SearchIndex.search()
diff --git a/yarn.lock b/yarn.lock
index 746c9bcae3..f9a86d35af 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -508,15 +508,15 @@
     minimatch "^3.0.4"
     plist "^3.0.4"
 
-"@emoji-mart/data@^1.0.6":
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/@emoji-mart/data/-/data-1.0.6.tgz#68f71be5e023653a3f9f73f4beadfd50848e2131"
-  integrity sha512-8wu3ec/kLCB0Y3K+pOKyY6Ob+xtQu3XhZvntdrpOTUQZ/PO6FW5PpFw7RE1kQ/up1fsVSJBl5mZ8Gs4SPwTYeg==
+"@emoji-mart/data@^1.1.2":
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/@emoji-mart/data/-/data-1.1.2.tgz#777c976f8f143df47cbb23a7077c9ca9fe5fc513"
+  integrity sha512-1HP8BxD2azjqWJvxIaWAMyTySeZY0Osr83ukYjltPVkNXeJvTz7yDrPLBtnrD5uqJ3tg4CcLuuBW09wahqL/fg==
 
-"@emoji-mart/react@^1.0.1":
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/@emoji-mart/react/-/react-1.0.1.tgz#46b6a2e92faf16fa9b7f9471f137fa2e3d1e8ac3"
-  integrity sha512-ALhLD96BOL5w+a4NI5NpmfqfF1aVjjj2qJE0dLst/OhjBfVmpteWNgn/h8LZy9ulU6AnbeS+13KnPFzDjCvRRw==
+"@emoji-mart/react@^1.1.1":
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@emoji-mart/react/-/react-1.1.1.tgz#ddad52f93a25baf31c5383c3e7e4c6e05554312a"
+  integrity sha512-NMlFNeWgv1//uPsvLxvGQoIerPuVdXwK/EUek8OOkJ6wVOWPUizRBJU0hDqWZCOROVpfBgCemaC3m6jDOXi03g==
 
 "@emotion/is-prop-valid@^0.8.8":
   version "0.8.8"
@@ -1010,13 +1010,6 @@
   dependencies:
     electron "*"
 
-"@types/emoji-mart@3.0.9":
-  version "3.0.9"
-  resolved "https://registry.yarnpkg.com/@types/emoji-mart/-/emoji-mart-3.0.9.tgz#2f7ef5d9ec194f28029c46c81a5fc1e5b0efa73c"
-  integrity sha512-qdBo/2Y8MXaJ/2spKjDZocuq79GpnOhkwMHnK2GnVFa8WYFgfA+ei6sil3aeWQPCreOKIx9ogPpR5+7MaOqYAA==
-  dependencies:
-    "@types/react" "*"
-
 "@types/eslint-scope@^3.7.3":
   version "3.7.4"
   resolved "https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.4.tgz#37fc1223f0786c39627068a12e94d6e6fc61de16"
@@ -3403,10 +3396,10 @@ electron@*, electron@25.3.0:
     "@types/node" "^18.11.18"
     extract-zip "^2.0.1"
 
-emoji-mart@^5.2.2:
-  version "5.2.2"
-  resolved "https://registry.yarnpkg.com/emoji-mart/-/emoji-mart-5.2.2.tgz#1c093ffc19554dd6edfcfeec9aca43ff38bcc16e"
-  integrity sha512-BvcrX+Ps9MxSVEjnvxupclU3MBD6WVC4WZOY26csfC6oFdaWpFhdrzeVNVBmCLPOmzY1SE0aAsqZJRNVbZ1yhQ==
+emoji-mart@^5.5.2:
+  version "5.5.2"
+  resolved "https://registry.yarnpkg.com/emoji-mart/-/emoji-mart-5.5.2.tgz#3ddbaf053139cf4aa217650078bc1c50ca8381af"
+  integrity sha512-Sqc/nso4cjxhOwWJsp9xkVm8OF5c+mJLZJFoFfzRuKO+yWiN7K8c96xmtughYb0d/fZ8UC6cLIQ/p4BR6Pv3/A==
 
 emoji-regex@^8.0.0:
   version "8.0.0"

From fe2d5ffe6df4bc4bf4fc1b92148468f425aa95d9 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Tue, 1 Aug 2023 07:04:40 +0200
Subject: [PATCH 3/8] test: fix remaining integration tests

"Check profile picture syncs" is not fixed yet as it need to be fully
updated and not just fixed (not done as part of this eslint-related PR)
---
 ts/test/automation/linked_device_user.spec.ts |  6 ++--
 ts/test/automation/setup/new_user.ts          | 13 ++++----
 ts/test/automation/utilities/leave_group.ts   |  2 +-
 .../unit/swarm_polling/SwarmPolling_test.ts   | 30 +++++++++----------
 4 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/ts/test/automation/linked_device_user.spec.ts b/ts/test/automation/linked_device_user.spec.ts
index c8af5e0dfd..5ccec8f8cd 100644
--- a/ts/test/automation/linked_device_user.spec.ts
+++ b/ts/test/automation/linked_device_user.spec.ts
@@ -83,10 +83,10 @@ test('Check profile picture syncs', async () => {
 
   await waitForTestIdWithText(windowA, 'copy-button-profile-update', 'Copy');
   await clickOnTestIdWithText(windowA, 'modal-close-button');
-
-  await sleepFor(500);
+  // TODO this test should retry a few times for the avatar to match
+  await sleepFor(500, true);
   const leftpaneAvatarContainer = await waitForTestIdWithText(windowB, 'leftpane-primary-avatar');
-  await sleepFor(500);
+  await sleepFor(500, true);
   const screenshot = await leftpaneAvatarContainer.screenshot({
     type: 'jpeg',
     // path: 'avatar-updated-blue',
diff --git a/ts/test/automation/setup/new_user.ts b/ts/test/automation/setup/new_user.ts
index 1139092892..99816bf34e 100644
--- a/ts/test/automation/setup/new_user.ts
+++ b/ts/test/automation/setup/new_user.ts
@@ -1,15 +1,10 @@
 import { Page } from '@playwright/test';
 import { User } from '../types/testing';
-import { clickOnMatchingText, typeIntoInput } from '../utilities/utils';
-import { sleepFor } from '../../../session/utils/Promise';
+import { clickOnMatchingText, clickOnTestIdWithText, typeIntoInput } from '../utilities/utils';
 
 export const newUser = async (window: Page, userName: string): Promise<User> => {
   // Create User
   await clickOnMatchingText(window, 'Create Session ID');
-  // Wait for animation for finish creating ID
-  await sleepFor(2500);
-  // Save session ID to a variable
-  const sessionid = await window.inputValue('[data-testid=session-id-signup]');
   await clickOnMatchingText(window, 'Continue');
   // Input username = testuser
   await typeIntoInput(window, 'display-name-input', userName);
@@ -17,6 +12,12 @@ export const newUser = async (window: Page, userName: string): Promise<User> =>
   // save recovery phrase
   await clickOnMatchingText(window, 'Reveal Recovery Phrase');
   const recoveryPhrase = await window.innerText('[data-testid=recovery-phrase-seed-modal]');
+  await window.click('.session-icon-button.small');
+
+  await clickOnTestIdWithText(window, 'leftpane-primary-avatar');
+
+  // Save session ID to a variable
+  const sessionid = await window.innerText('[data-testid=your-session-id]');
 
   console.info(`${userName}: Session ID: ${sessionid} and Recovery phrase: ${recoveryPhrase}`);
   await window.click('.session-icon-button.small');
diff --git a/ts/test/automation/utilities/leave_group.ts b/ts/test/automation/utilities/leave_group.ts
index 84cd0b2597..3318755c5a 100644
--- a/ts/test/automation/utilities/leave_group.ts
+++ b/ts/test/automation/utilities/leave_group.ts
@@ -1,4 +1,4 @@
-import {  Page } from '@playwright/test';
+import { Page } from '@playwright/test';
 import { clickOnMatchingText, clickOnTestIdWithText, waitForTestIdWithText } from './utils';
 
 export const leaveGroup = async (window: Page) => {
diff --git a/ts/test/session/unit/swarm_polling/SwarmPolling_test.ts b/ts/test/session/unit/swarm_polling/SwarmPolling_test.ts
index 4af38c1fbf..5f904582b4 100644
--- a/ts/test/session/unit/swarm_polling/SwarmPolling_test.ts
+++ b/ts/test/session/unit/swarm_polling/SwarmPolling_test.ts
@@ -202,7 +202,7 @@ describe('SwarmPolling', () => {
       await swarmPolling.start(true);
 
       expect(pollOnceForKeySpy.callCount).to.eq(1);
-      expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0]]);
+      expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0, 2, 3, 5, 4]]);
     });
 
     it('does run for our pubkey even if activeAt is recent ', async () => {
@@ -214,7 +214,7 @@ describe('SwarmPolling', () => {
       await swarmPolling.start(true);
 
       expect(pollOnceForKeySpy.callCount).to.eq(1);
-      expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0]]);
+      expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0, 2, 3, 5, 4]]);
     });
 
     describe('legacy group', () => {
@@ -231,7 +231,7 @@ describe('SwarmPolling', () => {
 
         // our pubkey will be polled for, hence the 2
         expect(pollOnceForKeySpy.callCount).to.eq(2);
-        expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0]]);
+        expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0, 2, 3, 5, 4]]);
         expect(pollOnceForKeySpy.secondCall.args).to.deep.eq([groupConvoPubkey, true, [-10]]);
       });
 
@@ -257,7 +257,7 @@ describe('SwarmPolling', () => {
 
         // our pubkey will be polled for, hence the 2
         expect(pollOnceForKeySpy.callCount).to.eq(2);
-        expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0]]);
+        expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0, 2, 3, 5, 4]]);
         expect(pollOnceForKeySpy.secondCall.args).to.deep.eq([groupConvoPubkey, true, [-10]]);
         getItemByIdStub.restore();
         getItemByIdStub = TestUtils.stubData('getItemById');
@@ -283,9 +283,9 @@ describe('SwarmPolling', () => {
         await swarmPolling.pollForAllKeys();
 
         expect(pollOnceForKeySpy.callCount).to.eq(3);
-        expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0]]);
+        expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0, 2, 3, 5, 4]]);
         expect(pollOnceForKeySpy.secondCall.args).to.deep.eq([groupConvoPubkey, true, [-10]]);
-        expect(pollOnceForKeySpy.thirdCall.args).to.deep.eq([ourPubkey, false, [0]]);
+        expect(pollOnceForKeySpy.thirdCall.args).to.deep.eq([ourPubkey, false, [0, 2, 3, 5, 4]]);
       });
 
       it('does run twice if activeAt less than one hour ', async () => {
@@ -302,7 +302,7 @@ describe('SwarmPolling', () => {
         swarmPolling.addGroupId(groupConvoPubkey);
         await swarmPolling.start(true);
         expect(pollOnceForKeySpy.callCount).to.eq(2);
-        expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0]]);
+        expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0, 2, 3, 5, 4]]);
         expect(pollOnceForKeySpy.secondCall.args).to.deep.eq([groupConvoPubkey, true, [-10]]);
         pollOnceForKeySpy.resetHistory();
         clock.tick(9000);
@@ -317,7 +317,7 @@ describe('SwarmPolling', () => {
         await sleepFor(10);
 
         expect(pollOnceForKeySpy.callCount).to.eq(2);
-        expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0]]);
+        expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0, 2, 3, 5, 4]]);
         expect(pollOnceForKeySpy.secondCall.args).to.deep.eq([groupConvoPubkey, true, [-10]]);
       });
 
@@ -347,9 +347,9 @@ describe('SwarmPolling', () => {
         await sleepFor(10);
         // we should have two more calls here, so 4 total.
         expect(pollOnceForKeySpy.callCount).to.eq(4);
-        expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0]]);
+        expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0, 2, 3, 5, 4]]);
         expect(pollOnceForKeySpy.secondCall.args).to.deep.eq([groupConvoPubkey, true, [-10]]);
-        expect(pollOnceForKeySpy.thirdCall.args).to.deep.eq([ourPubkey, false, [0]]);
+        expect(pollOnceForKeySpy.thirdCall.args).to.deep.eq([ourPubkey, false, [0, 2, 3, 5, 4]]);
         expect(pollOnceForKeySpy.getCalls()[3].args).to.deep.eq([groupConvoPubkey, true, [-10]]);
       });
 
@@ -374,7 +374,7 @@ describe('SwarmPolling', () => {
         // we should have only one more call here, the one for our direct pubkey fetch
         expect(pollOnceForKeySpy.callCount).to.eq(3);
         expect(pollOnceForKeySpy.secondCall.args).to.deep.eq([groupConvoPubkey, true, [-10]]); // this one comes from the swarmPolling.start
-        expect(pollOnceForKeySpy.thirdCall.args).to.deep.eq([ourPubkey, false, [0]]);
+        expect(pollOnceForKeySpy.thirdCall.args).to.deep.eq([ourPubkey, false, [0, 2, 3, 5, 4]]);
       });
 
       describe('multiple runs', () => {
@@ -416,10 +416,10 @@ describe('SwarmPolling', () => {
           // we have 4 calls total. 2 for our direct promises run each 5 seconds, and 2 for the group pubkey active (so run every 5 sec too)
           expect(pollOnceForKeySpy.callCount).to.eq(4);
           // first two calls are our pubkey
-          expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0]]);
+          expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0, 2, 3, 5, 4]]);
           expect(pollOnceForKeySpy.secondCall.args).to.deep.eq([groupConvoPubkey, true, [-10]]);
 
-          expect(pollOnceForKeySpy.thirdCall.args).to.deep.eq([ourPubkey, false, [0]]);
+          expect(pollOnceForKeySpy.thirdCall.args).to.deep.eq([ourPubkey, false, [0, 2, 3, 5, 4]]);
           expect(pollOnceForKeySpy.getCalls()[3].args).to.deep.eq([groupConvoPubkey, true, [-10]]);
         });
 
@@ -440,9 +440,9 @@ describe('SwarmPolling', () => {
           expect(pollOnceForKeySpy.callCount).to.eq(4);
 
           // first two calls are our pubkey
-          expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0]]);
+          expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0, 2, 3, 5, 4]]);
           expect(pollOnceForKeySpy.secondCall.args).to.deep.eq([groupConvoPubkey, true, [-10]]);
-          expect(pollOnceForKeySpy.thirdCall.args).to.deep.eq([ourPubkey, false, [0]]);
+          expect(pollOnceForKeySpy.thirdCall.args).to.deep.eq([ourPubkey, false, [0, 2, 3, 5, 4]]);
           expect(pollOnceForKeySpy.getCalls()[3].args).to.deep.eq([groupConvoPubkey, true, [-10]]);
         });
       });

From 9e21d6e0ac1daaecfbd89db7e05d89196a9eafb3 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Tue, 1 Aug 2023 12:05:39 +0200
Subject: [PATCH 4/8] chore: remove unused dependencies

---
 package.json |   28 +-
 yarn.lock    | 1622 +++++++-------------------------------------------
 2 files changed, 217 insertions(+), 1433 deletions(-)

diff --git a/package.json b/package.json
index c6a941cb8b..c259527bac 100644
--- a/package.json
+++ b/package.json
@@ -39,7 +39,7 @@
     "build-everything": "yarn clean && yarn protobuf && yarn update-git-info && yarn sass && tsc && yarn build:workers",
     "build-everything:watch": "yarn clean && yarn protobuf && yarn update-git-info && yarn sass && yarn build:workers && tsc -w",
     "build:workers": "yarn worker:utils && yarn worker:libsession",
-    "watch": "yarn clean && yarn protobuf && yarn update-git-info && concurrently 'yarn build-everything:watch'",
+    "watch": "yarn clean && yarn protobuf && yarn update-git-info && yarn build-everything:watch",
     "protobuf": "pbjs --target static-module --wrap commonjs --out ts/protobuf/compiled.js protos/*.proto && pbts --out ts/protobuf/compiled.d.ts ts/protobuf/compiled.js --force-long",
     "sass": "rimraf 'stylesheets/dist/' && webpack  --config=./sass.config.js",
     "clean": "rimraf 'ts/**/*.js' 'ts/*.js' 'ts/*.js.map' 'ts/**/*.js.map' && rimraf tsconfig.tsbuildinfo;",
@@ -47,10 +47,8 @@
     "format-full": "prettier --list-different --write \"*.{css,js,json,scss,ts,tsx}\" \"./**/*.{css,js,json,scss,ts,tsx}\"",
     "integration-test": "npx playwright test",
     "start-prod-test": "cross-env NODE_ENV=production NODE_APP_INSTANCE=$MULTI electron .",
-
     "integration-test-snapshots": "npx playwright test -g 'profile picture' --update-snapshots",
     "test": "mocha  -r jsdom-global/register --recursive --exit --timeout 10000  \"./ts/test/**/*_test.js\"",
-    "coverage": "nyc --reporter=html mocha  -r jsdom-global/register --recursive --exit --timeout 10000  \"./ts/test/**/*_test.js\"",
     "build-release": "run-script-os",
     "build-release-non-linux": "yarn build-everything && cross-env SIGNAL_ENV=production electron-builder --config.extraMetadata.environment=production --publish=never --config.directories.output=release",
     "build-release:win32": "yarn build-release-non-linux",
@@ -80,13 +78,11 @@
     "auto-bind": "^4.0.0",
     "backbone": "1.3.3",
     "blob-util": "2.0.2",
-    "blueimp-canvas-to-blob": "^3.29.0",
     "blueimp-load-image": "5.14.0",
     "buffer-crc32": "0.2.13",
     "bunyan": "^1.8.15",
     "bytebuffer": "^5.0.1",
     "classnames": "2.2.5",
-    "color": "^3.1.2",
     "config": "1.28.1",
     "country-code-lookup": "^0.0.19",
     "curve25519-js": "https://github.com/oxen-io/curve25519-js",
@@ -107,13 +103,11 @@
     "long": "^4.0.0",
     "mic-recorder-to-mp3": "^2.2.2",
     "moment": "^2.29.4",
-    "mustache": "2.3.0",
     "node-fetch": "^2.6.7",
     "os-locale": "5.0.0",
     "p-retry": "^4.2.0",
     "pify": "3.0.0",
     "protobufjs": "^6.11.2",
-    "queue-promise": "^2.2.1",
     "rc-slider": "^8.7.1",
     "react": "^17.0.2",
     "react-contexify": "5.0.0",
@@ -122,7 +116,6 @@
     "react-h5-audio-player": "^3.2.0",
     "react-intersection-observer": "^8.30.3",
     "react-mentions": "^4.4.9",
-    "react-portal": "^4.2.0",
     "react-qr-svg": "^2.2.1",
     "react-redux": "8.0.4",
     "react-toastify": "^6.0.9",
@@ -150,7 +143,6 @@
     "@types/chai": "4.2.18",
     "@types/chai-as-promised": "^7.1.2",
     "@types/classnames": "2.2.3",
-    "@types/color": "^3.0.0",
     "@types/config": "0.0.34",
     "@types/dompurify": "^2.0.0",
     "@types/electron-localshortcut": "^3.1.0",
@@ -161,14 +153,11 @@
     "@types/linkify-it": "^3.0.2",
     "@types/lodash": "^4.14.194",
     "@types/mocha": "5.0.0",
-    "@types/mustache": "^4.1.2",
     "@types/node-fetch": "^2.5.7",
     "@types/pify": "3.0.2",
     "@types/rc-slider": "^8.6.5",
     "@types/react": "^17.0.2",
     "@types/react-dom": "^17.0.2",
-    "@types/react-mic": "^12.4.1",
-    "@types/react-portal": "^4.0.2",
     "@types/react-redux": "^7.1.24",
     "@types/react-virtualized": "9.18.12",
     "@types/redux-logger": "3.0.7",
@@ -180,18 +169,14 @@
     "@typescript-eslint/eslint-plugin": "^6.1.0",
     "@typescript-eslint/parser": "^6.1.0",
     "asar": "3.1.0",
-    "buffer": "^6.0.3",
     "chai": "^4.3.4",
     "chai-as-promised": "^7.1.1",
     "chai-bytes": "^0.1.2",
-    "cmake-js": "^7.2.1",
-    "concurrently": "^7.4.0",
     "cross-env": "^6.0.3",
     "css-loader": "^6.7.2",
     "dmg-builder": "23.6.0",
     "electron": "25.3.0",
     "electron-builder": "23.0.8",
-    "esbuild": "^0.14.29",
     "eslint": "^8.45.0",
     "eslint-config-airbnb-base": "^15.0.0",
     "eslint-config-prettier": "^8.8.0",
@@ -201,30 +186,23 @@
     "eslint-plugin-react": "^7.33.0",
     "eslint-plugin-react-hooks": "^4.6.0",
     "events": "^3.3.0",
-    "jsdom": "^19.0.0",
+    "jsdom": "^22.1.0",
     "jsdom-global": "^3.0.2",
     "mini-css-extract-plugin": "^2.7.5",
     "mocha": "10.0.0",
-    "nan": "^2.17.0",
-    "node-gyp": "9.0.0",
     "node-loader": "^2.0.0",
-    "nyc": "^15.1.0",
     "patch-package": "^6.4.7",
     "playwright": "1.16.3",
-    "postcss-loader": "^7.0.2",
     "postinstall-prepare": "^1.0.1",
     "prettier": "1.19.0",
-    "process": "^0.11.10",
     "run-script-os": "^1.1.6",
     "sass": "^1.60.0",
     "sass-loader": "^13.2.2",
     "sinon": "9.0.2",
-    "style-loader": "^3.3.1",
     "ts-loader": "^9.4.2",
-    "ts-mock-imports": "^1.3.0",
     "typescript": "^5.1.6",
     "webpack": "^5.76.3",
-    "webpack-cli": "^5.0.1"
+    "webpack-cli": "^5.1.4"
   },
   "engines": {
     "node": "18.15.0"
diff --git a/yarn.lock b/yarn.lock
index f9a86d35af..9718a312a2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -20,7 +20,7 @@
     "@jridgewell/gen-mapping" "^0.1.0"
     "@jridgewell/trace-mapping" "^0.3.9"
 
-"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.14.5", "@babel/code-frame@^7.18.6":
+"@babel/code-frame@^7.12.13", "@babel/code-frame@^7.14.5", "@babel/code-frame@^7.18.6":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.18.6.tgz#3b25d38c89600baa2dcc219edfa88a74eb2c427a"
   integrity sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==
@@ -32,7 +32,7 @@
   resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.18.8.tgz#2483f565faca607b8535590e84e7de323f27764d"
   integrity sha512-HSmX4WZPPK3FUxYp7g2T6EyO8j96HlZJlxmKPSh6KAcqwyDrfx7hKjXpAW/0FhFfTJsR0Yt4lAjLI2coMptIHQ==
 
-"@babel/core@^7.14.8", "@babel/core@^7.7.5":
+"@babel/core@^7.14.8":
   version "7.18.9"
   resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.18.9.tgz#805461f967c77ff46c74ca0460ccf4fe933ddd59"
   integrity sha512-1LIb1eL8APMy91/IMW+31ckrfBM4yCoLaVzoDhZUKSM4cu1L1nIidyxkCgzPAgrC5WEz36IPEr/eSeSF9pIn+g==
@@ -411,14 +411,7 @@
   dependencies:
     regenerator-runtime "^0.13.2"
 
-"@babel/runtime@^7.1.2", "@babel/runtime@^7.10.2", "@babel/runtime@^7.12.1", "@babel/runtime@^7.5.5", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2":
-  version "7.19.0"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.19.0.tgz#22b11c037b094d27a8a2504ea4dcff00f50e2259"
-  integrity sha512-eR8Lo9hnDS7tqkO7NsV+mKvCmv5boaXFSZ70DnfhcgiEne8hv9oCEd36Klw74EtizEqLsy4YnW8UWwpBVolHZA==
-  dependencies:
-    regenerator-runtime "^0.13.4"
-
-"@babel/runtime@^7.3.4":
+"@babel/runtime@^7.1.2", "@babel/runtime@^7.10.2", "@babel/runtime@^7.12.1", "@babel/runtime@^7.3.4", "@babel/runtime@^7.5.5", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.22.5.tgz#8564dd588182ce0047d55d7a75e93921107b57ec"
   integrity sha512-ecjvYlnAaZ/KVneE/OdKYBYfgXV3Ptu6zQWmgEF7vwKhQnvVS6bjMD2XYgj+SNvQ1GfK/pjgokfPkC/2CO8CuA==
@@ -572,11 +565,6 @@
   resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.44.0.tgz#961a5903c74139390478bdc808bcde3fc45ab7af"
   integrity sha512-Ag+9YM4ocKQx9AarydN0KY2j0ErMHNIocPDrVo8zAE44xLTjEtz81OdR68/cydGtk6m6jDb5Za3r2useMzYmSw==
 
-"@gar/promisify@^1.1.3":
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.3.tgz#555193ab2e3bb3b6adc3d551c9c030d9e860daf6"
-  integrity sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==
-
 "@humanwhocodes/config-array@^0.11.10":
   version "0.11.10"
   resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.10.tgz#5a3ffe32cc9306365fb3fd572596cd602d5e12d2"
@@ -606,22 +594,6 @@
   resolved "https://registry.yarnpkg.com/@iconify/react/-/react-3.2.1.tgz#d18da31cec58c1aa8fdf4def451cc7e3196d88de"
   integrity sha512-yKzixjC9ct9RC/aSGo1OGxkG2rpfhlr/urRz6k2YZlIBzn92PBTlqtSx8o8dFYEorr3eUFSCBZFzBy1yw5jsAA==
 
-"@istanbuljs/load-nyc-config@^1.0.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz#fd3db1d59ecf7cf121e80650bb86712f9b55eced"
-  integrity sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==
-  dependencies:
-    camelcase "^5.3.1"
-    find-up "^4.1.0"
-    get-package-type "^0.1.0"
-    js-yaml "^3.13.1"
-    resolve-from "^5.0.0"
-
-"@istanbuljs/schema@^0.1.2":
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.3.tgz#e45e384e4b8ec16bce2fd903af78450f6bf7ec98"
-  integrity sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==
-
 "@jest/types@^27.2.5", "@jest/types@^27.5.1":
   version "27.5.1"
   resolved "https://registry.yarnpkg.com/@jest/types/-/types-27.5.1.tgz#3c79ec4a8ba61c170bf937bcf9e98a9df175ec80"
@@ -719,22 +691,6 @@
     "@nodelib/fs.scandir" "2.1.5"
     fastq "^1.6.0"
 
-"@npmcli/fs@^2.1.0":
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/@npmcli/fs/-/fs-2.1.0.tgz#f2a21c28386e299d1a9fae8051d35ad180e33109"
-  integrity sha512-DmfBvNXGaetMxj9LTp8NAN9vEidXURrf5ZTslQzEAi/6GbW+4yjaLFQc6Tue5cpZ9Frlk4OBo/Snf1Bh/S7qTQ==
-  dependencies:
-    "@gar/promisify" "^1.1.3"
-    semver "^7.3.5"
-
-"@npmcli/move-file@^2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@npmcli/move-file/-/move-file-2.0.0.tgz#417f585016081a0184cef3e38902cd917a9bbd02"
-  integrity sha512-UR6D5f4KEGWJV6BGPH3Qb2EtgH+t+1XQ1Tt85c7qicN6cezzuHPdZwwAxqZr4JLtnQu0LZsTza/5gmNmSl8XLg==
-  dependencies:
-    mkdirp "^1.0.4"
-    rimraf "^3.0.2"
-
 "@playwright/test@1.16.3":
   version "1.16.3"
   resolved "https://registry.yarnpkg.com/@playwright/test/-/test-1.16.3.tgz#99439d07af6a355586393b463fd88315f32d2a57"
@@ -965,25 +921,6 @@
   resolved "https://registry.yarnpkg.com/@types/classnames/-/classnames-2.2.3.tgz#3f0ff6873da793870e20a260cada55982f38a9e5"
   integrity sha512-x15/Io+JdzrkM9gnX6SWUs/EmqQzd65TD9tcZIAQ1VIdb93XErNuYmB7Yho8JUCE189ipUSESsWvGvYXRRIvYA==
 
-"@types/color-convert@*":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@types/color-convert/-/color-convert-2.0.0.tgz#8f5ee6b9e863dcbee5703f5a517ffb13d3ea4e22"
-  integrity sha512-m7GG7IKKGuJUXvkZ1qqG3ChccdIM/qBBo913z+Xft0nKCX4hAU/IxKwZBU4cpRZ7GS5kV4vOblUkILtSShCPXQ==
-  dependencies:
-    "@types/color-name" "*"
-
-"@types/color-name@*":
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/@types/color-name/-/color-name-1.1.1.tgz#1c1261bbeaa10a8055bbc5d8ab84b7b2afc846a0"
-  integrity sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==
-
-"@types/color@^3.0.0":
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/@types/color/-/color-3.0.3.tgz#e6d8d72b7aaef4bb9fe80847c26c7c786191016d"
-  integrity sha512-X//qzJ3d3Zj82J9sC/C18ZY5f43utPbAJ6PhYt/M7uG6etcF6MRpKdN880KBy43B0BMzSfeT96MzrsNjFI3GbA==
-  dependencies:
-    "@types/color-convert" "*"
-
 "@types/config@0.0.34":
   version "0.0.34"
   resolved "https://registry.yarnpkg.com/@types/config/-/config-0.0.34.tgz#123f91bdb5afdd702294b9de9ca04d9ea11137b0"
@@ -1119,12 +1056,7 @@
   resolved "https://registry.yarnpkg.com/@types/json-buffer/-/json-buffer-3.0.0.tgz#85c1ff0f0948fc159810d4b5be35bf8c20875f64"
   integrity sha512-3YP80IxxFJB4b5tYC2SUPwkg0XQLiu0nWvhRgEatgjf+29IcWO9X1k8xRv5DGssJ/lCrjYTjQPcobJr2yWIVuQ==
 
-"@types/json-schema@*", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9":
-  version "7.0.11"
-  resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.11.tgz#d421b6c527a3037f7c84433fd2c4229e016863d3"
-  integrity sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==
-
-"@types/json-schema@^7.0.12":
+"@types/json-schema@*", "@types/json-schema@^7.0.12", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9":
   version "7.0.12"
   resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.12.tgz#d70faba7039d5fca54c83c7dbab41051d2b6f6cb"
   integrity sha512-Hr5Jfhc9eYOQNPYO5WLDq/n4jqijdHNlDXjuAQkkt+mWdQR+XJToOHrsD4cPaMXpn6KO7y2+wM8AZEs8VpBLVA==
@@ -1183,11 +1115,6 @@
   resolved "https://registry.yarnpkg.com/@types/ms/-/ms-0.7.31.tgz#31b7ca6407128a3d2bbc27fe2d21b345397f6197"
   integrity sha512-iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA==
 
-"@types/mustache@^4.1.2":
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/@types/mustache/-/mustache-4.1.2.tgz#d0e158013c81674a5b6d8780bc3fe234e1804eaf"
-  integrity sha512-c4OVMMcyodKQ9dpwBwh3ofK9P6U9ZktKU9S+p33UqwMNN1vlv2P0zJZUScTshnx7OEoIIRcCFNQ904sYxZz8kg==
-
 "@types/node-fetch@^2.5.7":
   version "2.6.2"
   resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.6.2.tgz#d1a9c5fd049d9415dce61571557104dec3ec81da"
@@ -1196,21 +1123,11 @@
     "@types/node" "*"
     form-data "^3.0.0"
 
-"@types/node@*", "@types/node@>=13.7.0":
-  version "17.0.35"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.35.tgz#635b7586086d51fb40de0a2ec9d1014a5283ba4a"
-  integrity sha512-vu1SrqBjbbZ3J6vwY17jBs8Sr/BKA+/a/WtjRG+whKg1iuLFOosq872EXS0eXWILdO36DHQQeku/ZcL6hz2fpg==
-
-"@types/node@^18.11.18":
+"@types/node@*", "@types/node@>=13.7.0", "@types/node@^18.11.18":
   version "18.16.19"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-18.16.19.tgz#cb03fca8910fdeb7595b755126a8a78144714eea"
   integrity sha512-IXl7o+R9iti9eBW4Wg2hx1xQDig183jj7YLn8F7udNceyfkbn1ZxmzZXuak20gR40D7pIkIY1kYGx5VIGbaHKA==
 
-"@types/parse-json@^4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.0.tgz#2f8bb441434d163b35fb8ffdccd7138927ffb8c0"
-  integrity sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==
-
 "@types/pify@3.0.2":
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/@types/pify/-/pify-3.0.2.tgz#1bc75dac43e31dba981c37e0a08edddc1b49cd39"
@@ -1258,20 +1175,6 @@
   dependencies:
     "@types/react" "*"
 
-"@types/react-mic@^12.4.1":
-  version "12.4.3"
-  resolved "https://registry.yarnpkg.com/@types/react-mic/-/react-mic-12.4.3.tgz#d6e0f318a7ff930c57060b988fcd8e541d713be5"
-  integrity sha512-PCp+Phe0WcFRPhDQjOfiONz2OJSef+ds+8g7vN/xqRntcfGKPCyr4ZaiICaNJ+8uZcoUaw7F1E15AEUOjRW4IQ==
-  dependencies:
-    "@types/react" "*"
-
-"@types/react-portal@^4.0.2":
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/@types/react-portal/-/react-portal-4.0.4.tgz#1c0e5a248f6e18a66f981139c13b6e796f4a92b6"
-  integrity sha512-ecVWngYHeSymq5XdrQOXRpIb9ay5SM4Stm/ur6+wc0Z+r05gafZ5SuMRbXKYsj4exNJa+4CTKK6J7qcTKm9K5g==
-  dependencies:
-    "@types/react" "*"
-
 "@types/react-redux@^7.1.24":
   version "7.1.24"
   resolved "https://registry.yarnpkg.com/@types/react-redux/-/react-redux-7.1.24.tgz#6caaff1603aba17b27d20f8ad073e4c077e975c0"
@@ -1290,15 +1193,7 @@
     "@types/prop-types" "*"
     "@types/react" "*"
 
-"@types/react@*", "@types/react@17.0.2", "@types/react@^17":
-  version "17.0.2"
-  resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.2.tgz#3de24c4efef902dd9795a49c75f760cbe4f7a5a8"
-  integrity sha512-Xt40xQsrkdvjn1EyWe1Bc0dJLcil/9x2vAuW7ya+PuQip4UYUaXyhzWmAbwRsdMgwOFHpfp7/FFZebDU6Y8VHA==
-  dependencies:
-    "@types/prop-types" "*"
-    csstype "^3.0.2"
-
-"@types/react@^17.0.2":
+"@types/react@*", "@types/react@^17", "@types/react@^17.0.2":
   version "17.0.45"
   resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.45.tgz#9b3d5b661fd26365fefef0e766a1c6c30ccf7b3f"
   integrity sha512-YfhQ22Lah2e3CHPsb93tRwIGNiSwkuz1/blk4e6QrWS0jQzCSNbGLtOEYhPg02W0yGTTmpajp7dCTbBAMN3qsg==
@@ -1307,6 +1202,14 @@
     "@types/scheduler" "*"
     csstype "^3.0.2"
 
+"@types/react@17.0.2":
+  version "17.0.2"
+  resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.2.tgz#3de24c4efef902dd9795a49c75f760cbe4f7a5a8"
+  integrity sha512-Xt40xQsrkdvjn1EyWe1Bc0dJLcil/9x2vAuW7ya+PuQip4UYUaXyhzWmAbwRsdMgwOFHpfp7/FFZebDU6Y8VHA==
+  dependencies:
+    "@types/prop-types" "*"
+    csstype "^3.0.2"
+
 "@types/redux-logger@3.0.7":
   version "3.0.7"
   resolved "https://registry.yarnpkg.com/@types/redux-logger/-/redux-logger-3.0.7.tgz#163f6f6865c69c21d56f9356dc8d741718ec0db0"
@@ -1344,12 +1247,7 @@
   resolved "https://registry.yarnpkg.com/@types/semver/-/semver-5.5.0.tgz#146c2a29ee7d3bae4bf2fcb274636e264c813c45"
   integrity sha512-41qEJgBH/TWgo5NFSvBCJ1qkoi3Q6ONSF2avrHq1LVEZfYpdHmj0y9SuTK+u9ZhG1sYQKBL1AWXKyLWP4RaUoQ==
 
-"@types/semver@^7.3.6":
-  version "7.3.9"
-  resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.3.9.tgz#152c6c20a7688c30b967ec1841d31ace569863fc"
-  integrity sha512-L/TMpyURfBkf+o/526Zb6kd/tchUP3iBDEPjqjb+U2MAJhVRxxrmr2fwpe08E7QsV7YLcpq0tUaQ9O9x97ZIxQ==
-
-"@types/semver@^7.5.0":
+"@types/semver@^7.3.6", "@types/semver@^7.5.0":
   version "7.5.0"
   resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.5.0.tgz#591c1ce3a702c45ee15f47a42ade72c2fd78978a"
   integrity sha512-G8hZ6XJiHnuhQKR7ZmysCeJWE08o8T0AXtk5darsCaTVsYZhhgUrq53jizaR2FvsoeCwJhlmwTjkXBY5Pn/ZHw==
@@ -1648,20 +1546,20 @@
     "@webassemblyjs/ast" "1.11.1"
     "@xtuc/long" "4.2.2"
 
-"@webpack-cli/configtest@^2.0.1":
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/@webpack-cli/configtest/-/configtest-2.0.1.tgz#a69720f6c9bad6aef54a8fa6ba9c3533e7ef4c7f"
-  integrity sha512-njsdJXJSiS2iNbQVS0eT8A/KPnmyH4pv1APj2K0d1wrZcBLw+yppxOy4CGqa0OxDJkzfL/XELDhD8rocnIwB5A==
+"@webpack-cli/configtest@^2.1.1":
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/@webpack-cli/configtest/-/configtest-2.1.1.tgz#3b2f852e91dac6e3b85fb2a314fb8bef46d94646"
+  integrity sha512-wy0mglZpDSiSS0XHrVR+BAdId2+yxPSoJW8fsna3ZpYSlufjvxnP4YbKTCBZnNIcGN4r6ZPXV55X4mYExOfLmw==
 
-"@webpack-cli/info@^2.0.1":
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/@webpack-cli/info/-/info-2.0.1.tgz#eed745799c910d20081e06e5177c2b2569f166c0"
-  integrity sha512-fE1UEWTwsAxRhrJNikE7v4EotYflkEhBL7EbajfkPlf6E37/2QshOy/D48Mw8G5XMFlQtS6YV42vtbG9zBpIQA==
+"@webpack-cli/info@^2.0.2":
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/@webpack-cli/info/-/info-2.0.2.tgz#cc3fbf22efeb88ff62310cf885c5b09f44ae0fdd"
+  integrity sha512-zLHQdI/Qs1UyT5UBdWNqsARasIA+AaF8t+4u2aS2nEpBQh2mWIVb8qAklq0eUENnC5mOItrIB4LiS9xMtph18A==
 
-"@webpack-cli/serve@^2.0.1":
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-2.0.1.tgz#34bdc31727a1889198855913db2f270ace6d7bf8"
-  integrity sha512-0G7tNyS+yW8TdgHwZKlDWYXFA6OJQnoLCQvYKkQP0Q2X205PSQ6RNUj0M+1OB/9gRQaUZ/ccYfaxd0nhaWKfjw==
+"@webpack-cli/serve@^2.0.5":
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-2.0.5.tgz#325db42395cd49fe6c14057f9a900e427df8810e"
+  integrity sha512-lqaoKnRYBdo1UgDX8uF24AfGMifWK19TxPmM5FHc2vAGxrJ/qtyUyFBWoY1tISZdelsQ5fBcOusifo5o5wSJxQ==
 
 "@xobotyi/scrollbar-width@^1.9.5":
   version "1.9.5"
@@ -1683,16 +1581,11 @@
   resolved "https://registry.yarnpkg.com/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz#e77a97fbd345b76d83245edcd17d393b1b41fb31"
   integrity sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ==
 
-abab@^2.0.5, abab@^2.0.6:
+abab@^2.0.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.6.tgz#41b80f2c871d19686216b82309231cfd3cb3d291"
   integrity sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==
 
-abbrev@1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
-  integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==
-
 abort-controller@3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/abort-controller/-/abort-controller-3.0.0.tgz#eaf54d53b62bae4138e809ca225c8439a6efb392"
@@ -1700,14 +1593,6 @@ abort-controller@3.0.0:
   dependencies:
     event-target-shim "^5.0.0"
 
-acorn-globals@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-6.0.0.tgz#46cdd39f0f8ff08a876619b55f5ac8a6dc770b45"
-  integrity sha512-ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg==
-  dependencies:
-    acorn "^7.1.1"
-    acorn-walk "^7.1.1"
-
 acorn-import-assertions@^1.7.6:
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz#ba2b5939ce62c238db6d93d81c9b111b29b855e9"
@@ -1718,22 +1603,7 @@ acorn-jsx@^5.3.2:
   resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937"
   integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==
 
-acorn-walk@^7.1.1:
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-7.2.0.tgz#0de889a601203909b0fbe07b8938dc21d2e967bc"
-  integrity sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==
-
-acorn@^7.1.1:
-  version "7.4.1"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa"
-  integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==
-
-acorn@^8.5.0, acorn@^8.7.1:
-  version "8.7.1"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.7.1.tgz#0197122c843d1bf6d0a5e83220a788f278f63c30"
-  integrity sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A==
-
-acorn@^8.9.0:
+acorn@^8.5.0, acorn@^8.7.1, acorn@^8.9.0:
   version "8.10.0"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.10.0.tgz#8be5b3907a67221a81ab23c7889c4c5526b62ec5"
   integrity sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==
@@ -1752,23 +1622,6 @@ agent-base@6, agent-base@^6.0.2:
   dependencies:
     debug "4"
 
-agentkeepalive@^4.2.1:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-4.2.1.tgz#a7975cbb9f83b367f06c90cc51ff28fe7d499717"
-  integrity sha512-Zn4cw2NEqd+9fiSVWMscnjyQ1a8Yfoc5oBajLeo5w+YBHgDUcEBY2hS4YpTz6iN5f/2zQiktcuM6tS8x1p9dpA==
-  dependencies:
-    debug "^4.1.0"
-    depd "^1.1.2"
-    humanize-ms "^1.2.1"
-
-aggregate-error@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.1.0.tgz#92670ff50f5359bdb7a3e0d40d0ec30c5737687a"
-  integrity sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==
-  dependencies:
-    clean-stack "^2.0.0"
-    indent-string "^4.0.0"
-
 ajv-formats@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/ajv-formats/-/ajv-formats-2.1.1.tgz#6e669400659eb74973bbf2e33327180a0996b520"
@@ -1926,23 +1779,11 @@ app-builder-lib@23.6.0:
     tar "^6.1.11"
     temp-file "^3.4.0"
 
-append-transform@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/append-transform/-/append-transform-2.0.0.tgz#99d9d29c7b38391e6f428d28ce136551f0b77e12"
-  integrity sha512-7yeyCEurROLQJFv5Xj4lEGTy0borxepjFv1g22oAdqFu//SrAlDl1O1Nxx15SH1RoliUml6p8dwJW9jvZughhg==
-  dependencies:
-    default-require-extensions "^3.0.0"
-
 "aproba@^1.0.3 || ^2.0.0":
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/aproba/-/aproba-2.0.0.tgz#52520b8ae5b569215b354efc0caa3fe1e45a8adc"
   integrity sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==
 
-archy@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/archy/-/archy-1.0.0.tgz#f9c8c13757cc1dd7bc379ac77b2c62a5c2868c40"
-  integrity sha512-Xg+9RwCg/0p32teKdGMPTPnVXKD0w3DfHnFTficozsAgsvq2XenPJq/MYpzzQ/v8zrOyJn6Ds39VA4JIDwFfqw==
-
 are-we-there-yet@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-3.0.0.tgz#ba20bd6b553e31d62fc8c31bd23d22b95734390d"
@@ -1951,13 +1792,6 @@ are-we-there-yet@^3.0.0:
     delegates "^1.0.0"
     readable-stream "^3.6.0"
 
-argparse@^1.0.7:
-  version "1.0.10"
-  resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
-  integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==
-  dependencies:
-    sprintf-js "~1.0.2"
-
 argparse@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"
@@ -2207,11 +2041,6 @@ bluebird@^3.5.0, bluebird@^3.5.5:
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
   integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==
 
-blueimp-canvas-to-blob@^3.29.0:
-  version "3.29.0"
-  resolved "https://registry.yarnpkg.com/blueimp-canvas-to-blob/-/blueimp-canvas-to-blob-3.29.0.tgz#d965f06cb1a67fdae207a2be56683f55ef531466"
-  integrity sha512-0pcSSGxC0QxT+yVkivxIqW0Y4VlO2XSDPofBAqoJ1qJxgH9eiUDLv50Rixij2cDuEfx4M6DpD9UGZpRhT5Q8qg==
-
 blueimp-load-image@5.14.0:
   version "5.14.0"
   resolved "https://registry.yarnpkg.com/blueimp-load-image/-/blueimp-load-image-5.14.0.tgz#e8086415e580df802c33ff0da6b37a8d20205cc6"
@@ -2251,11 +2080,6 @@ braces@^3.0.2, braces@~3.0.2:
   dependencies:
     fill-range "^7.0.1"
 
-browser-process-hrtime@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz#3c9b4b7d782c8121e56f10106d84c0d0ffc94626"
-  integrity sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==
-
 browser-stdout@1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/browser-stdout/-/browser-stdout-1.3.1.tgz#baa559ee14ced73452229bad7326467c61fabd60"
@@ -2312,14 +2136,6 @@ buffer@^5.1.0:
     base64-js "^1.3.1"
     ieee754 "^1.1.13"
 
-buffer@^6.0.3:
-  version "6.0.3"
-  resolved "https://registry.yarnpkg.com/buffer/-/buffer-6.0.3.tgz#2ace578459cc8fbe2a70aaa8f52ee63b6a74c6c6"
-  integrity sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==
-  dependencies:
-    base64-js "^1.3.1"
-    ieee754 "^1.2.1"
-
 builder-util-runtime@8.9.2:
   version "8.9.2"
   resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-8.9.2.tgz#a9669ae5b5dcabfe411ded26678e7ae997246c28"
@@ -2407,30 +2223,6 @@ bytebuffer@^5.0.1:
   dependencies:
     long "~3"
 
-cacache@^16.1.0:
-  version "16.1.0"
-  resolved "https://registry.yarnpkg.com/cacache/-/cacache-16.1.0.tgz#87a6bae558a511c9cb2a13768073e240ca76153a"
-  integrity sha512-Pk4aQkwCW82A4jGKFvcGkQFqZcMspfP9YWq9Pr87/ldDvlWf718zeI6KWCdKt/jeihu6BytHRUicJPB1K2k8EQ==
-  dependencies:
-    "@npmcli/fs" "^2.1.0"
-    "@npmcli/move-file" "^2.0.0"
-    chownr "^2.0.0"
-    fs-minipass "^2.1.0"
-    glob "^8.0.1"
-    infer-owner "^1.0.4"
-    lru-cache "^7.7.1"
-    minipass "^3.1.6"
-    minipass-collect "^1.0.2"
-    minipass-flush "^1.0.5"
-    minipass-pipeline "^1.2.4"
-    mkdirp "^1.0.4"
-    p-map "^4.0.0"
-    promise-inflight "^1.0.1"
-    rimraf "^3.0.2"
-    ssri "^9.0.0"
-    tar "^6.1.11"
-    unique-filename "^1.1.1"
-
 cacheable-lookup@^5.0.3:
   version "5.0.4"
   resolved "https://registry.yarnpkg.com/cacheable-lookup/-/cacheable-lookup-5.0.4.tgz#5a6b865b2c44357be3d5ebc2a467b032719a7005"
@@ -2449,16 +2241,6 @@ cacheable-request@^7.0.2:
     normalize-url "^6.0.1"
     responselike "^2.0.0"
 
-caching-transform@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/caching-transform/-/caching-transform-4.0.0.tgz#00d297a4206d71e2163c39eaffa8157ac0651f0f"
-  integrity sha512-kpqOvwXnjjN44D89K5ccQC+RUrsy7jB/XLlRrx0D7/2HNcTPqzsb6XgYoErwko6QsV184CA2YgS1fxDiiDZMWA==
-  dependencies:
-    hasha "^5.0.0"
-    make-dir "^3.0.0"
-    package-hash "^4.0.0"
-    write-file-atomic "^3.0.0"
-
 call-bind@^1.0.0, call-bind@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c"
@@ -2472,11 +2254,6 @@ callsites@^3.0.0:
   resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73"
   integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==
 
-camelcase@^5.0.0, camelcase@^5.3.1:
-  version "5.3.1"
-  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
-  integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
-
 camelcase@^6.0.0, camelcase@^6.2.0:
   version "6.3.0"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.3.0.tgz#5685b95eb209ac9c0c177467778c9c84df58ba9a"
@@ -2600,11 +2377,6 @@ classnames@^2.2.5, classnames@^2.2.6:
   resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.3.1.tgz#dfcfa3891e306ec1dad105d0e88f4417b8535e8e"
   integrity sha512-OlQdbZ7gLfGarSqxesMesDa5uz7KFbID8Kpq/SxIoNGDqY8lSYs0D+hhtBXhcdB3rcbXArFr7vlHheLk1voeNA==
 
-clean-stack@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b"
-  integrity sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==
-
 cli-boxes@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-2.2.1.tgz#ddd5035d25094fce220e9cab40a45840a440318f"
@@ -2618,15 +2390,6 @@ cli-truncate@^2.1.0:
     slice-ansi "^3.0.0"
     string-width "^4.2.0"
 
-cliui@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/cliui/-/cliui-6.0.0.tgz#511d702c0c4e41ca156d7d0e96021f23e13225b1"
-  integrity sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==
-  dependencies:
-    string-width "^4.2.0"
-    strip-ansi "^6.0.0"
-    wrap-ansi "^6.2.0"
-
 cliui@^7.0.2:
   version "7.0.4"
   resolved "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz#a0265ee655476fc807aea9df3df8df7783808b4f"
@@ -2685,7 +2448,7 @@ cmake-js@^7.2.1:
     which "^2.0.2"
     yargs "^17.6.0"
 
-color-convert@^1.9.0, color-convert@^1.9.3:
+color-convert@^1.9.0:
   version "1.9.3"
   resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
   integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==
@@ -2704,36 +2467,20 @@ color-name@1.1.3:
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
   integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=
 
-color-name@^1.0.0, color-name@~1.1.4:
+color-name@~1.1.4:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
   integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
 
-color-string@^1.6.0:
-  version "1.9.1"
-  resolved "https://registry.yarnpkg.com/color-string/-/color-string-1.9.1.tgz#4467f9146f036f855b764dfb5bf8582bf342c7a4"
-  integrity sha512-shrVawQFojnZv6xM40anx4CkoDP+fZsw/ZerEMsW/pyzsRbElpsL/DBVW7q3ExxwusdNXI3lXpuhEZkzs8p5Eg==
-  dependencies:
-    color-name "^1.0.0"
-    simple-swizzle "^0.2.2"
-
 color-support@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz#93834379a1cc9a0c61f82f52f0d04322251bd5a2"
   integrity sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==
 
-color@^3.1.2:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/color/-/color-3.2.1.tgz#3544dc198caf4490c3ecc9a790b54fe9ff45e164"
-  integrity sha512-aBl7dZI9ENN6fUGC7mWpMTPNHmWUSNan9tuWN6ahh5ZLNk9baLJOnSMlrQkHcrfFgz2/RigjUVAjdx36VcemKA==
-  dependencies:
-    color-convert "^1.9.3"
-    color-string "^1.6.0"
-
 colorette@^2.0.14:
-  version "2.0.19"
-  resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.19.tgz#cdf044f47ad41a0f4b56b3a0d5b4e6e1a2d5a798"
-  integrity sha512-3tlv/dIP7FWvj3BsbHrGLJ6l/oKh1O3TcgBqMn+yyCagOxc23fyzDS6HypQbgxWbkpDnf52p1LuR4eWDQ/K9WQ==
+  version "2.0.20"
+  resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.20.tgz#9eb793e6833067f7235902fcd3b09917a000a95a"
+  integrity sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==
 
 colors@1.0.3:
   version "1.0.3"
@@ -2759,6 +2506,11 @@ commander@2.9.0:
   dependencies:
     graceful-readlink ">= 1.0.0"
 
+commander@^10.0.1:
+  version "10.0.1"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-10.0.1.tgz#881ee46b4f77d1c1dccc5823433aa39b022cbe06"
+  integrity sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==
+
 commander@^2.20.0:
   version "2.20.3"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
@@ -2774,16 +2526,6 @@ commander@^8.2.0:
   resolved "https://registry.yarnpkg.com/commander/-/commander-8.3.0.tgz#4837ea1b2da67b9c616a67afbb0fafee567bca66"
   integrity sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==
 
-commander@^9.4.1:
-  version "9.4.1"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-9.4.1.tgz#d1dd8f2ce6faf93147295c0df13c7c21141cfbdd"
-  integrity sha512-5EEkTNyHNGFPD2H+c/dXXfQZYa/scCKasxWcXJaWnNJ99pnQN9Vnmqow+p+PlFPE63Q6mThaZws1T+HxfpgtPw==
-
-commondir@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
-  integrity sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg==
-
 compare-version@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/compare-version/-/compare-version-0.1.2.tgz#0162ec2d9351f5ddd59a9202cba935366a725080"
@@ -2814,21 +2556,6 @@ concat-map@0.0.1:
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
   integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
 
-concurrently@^7.4.0:
-  version "7.4.0"
-  resolved "https://registry.yarnpkg.com/concurrently/-/concurrently-7.4.0.tgz#bb0e344964bc172673577c420db21e963f2f7368"
-  integrity sha512-M6AfrueDt/GEna/Vg9BqQ+93yuvzkSKmoTixnwEJkH0LlcGrRC2eCmjeG1tLLHIYfpYJABokqSGyMcXjm96AFA==
-  dependencies:
-    chalk "^4.1.0"
-    date-fns "^2.29.1"
-    lodash "^4.17.21"
-    rxjs "^7.0.0"
-    shell-quote "^1.7.3"
-    spawn-command "^0.0.2-1"
-    supports-color "^8.1.0"
-    tree-kill "^1.2.2"
-    yargs "^17.3.1"
-
 config@1.28.1:
   version "1.28.1"
   resolved "https://registry.yarnpkg.com/config/-/config-1.28.1.tgz#7625d2a1e4c90f131d8a73347982d93c3873282d"
@@ -2883,17 +2610,6 @@ core-util-is@1.0.2:
   resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
   integrity sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==
 
-cosmiconfig@^7.0.0:
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-7.1.0.tgz#1443b9afa596b670082ea46cbd8f6a62b84635f6"
-  integrity sha512-AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA==
-  dependencies:
-    "@types/parse-json" "^4.0.0"
-    import-fresh "^3.2.1"
-    parse-json "^5.0.0"
-    path-type "^4.0.0"
-    yaml "^1.10.0"
-
 country-code-lookup@^0.0.19:
   version "0.0.19"
   resolved "https://registry.yarnpkg.com/country-code-lookup/-/country-code-lookup-0.0.19.tgz#3fbf0192758ecf0d5eee0efbc220d62706c50fd6"
@@ -2995,22 +2711,12 @@ cssesc@^3.0.0:
   resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee"
   integrity sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==
 
-cssom@^0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.5.0.tgz#d254fa92cd8b6fbd83811b9fbaed34663cc17c36"
-  integrity sha512-iKuQcq+NdHqlAcwUY0o/HL69XQrUaQdMjmStJ8JFmUaiiQErlhrmuigkg/CU4E2J0IyUKUrMAgl36TvN67MqTw==
-
-cssom@~0.3.6:
-  version "0.3.8"
-  resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.8.tgz#9f1276f5b2b463f2114d3f2c75250af8c1a36f4a"
-  integrity sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==
-
-cssstyle@^2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-2.3.0.tgz#ff665a0ddbdc31864b09647f34163443d90b0852"
-  integrity sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==
+cssstyle@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-3.0.0.tgz#17ca9c87d26eac764bb8cfd00583cff21ce0277a"
+  integrity sha512-N4u2ABATi3Qplzf0hWbVCdjenim8F3ojEXpBDF5hBpjzW182MjNGLqfmQ0SkSPeQ+V86ZXgeH8aXj6kayd4jgg==
   dependencies:
-    cssom "~0.3.6"
+    rrweb-cssom "^0.6.0"
 
 csstype@^3.0.2, csstype@^3.0.6:
   version "3.1.0"
@@ -3021,19 +2727,14 @@ csstype@^3.0.2, csstype@^3.0.6:
   version "0.0.4"
   resolved "https://github.com/oxen-io/curve25519-js#102f8c0a31b5c58bad8606979036cf763be9f4f6"
 
-data-urls@^3.0.1:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-3.0.2.tgz#9cf24a477ae22bcef5cd5f6f0bfbc1d2d3be9143"
-  integrity sha512-Jy/tj3ldjZJo63sVAvg6LHt2mHvl4V6AgRAmNDtLdm7faqtsx+aJG42rsyCo9JCoRVKwPFzKlIPx3DIibwSIaQ==
+data-urls@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-4.0.0.tgz#333a454eca6f9a5b7b0f1013ff89074c3f522dd4"
+  integrity sha512-/mMTei/JXPqvFqQtfyTowxmJVwr2PVAeCcDxyFf6LhoOu/09TX2OX3kb2wzi4DMXcfj4OItwDOnhl5oziPnT6g==
   dependencies:
     abab "^2.0.6"
     whatwg-mimetype "^3.0.0"
-    whatwg-url "^11.0.0"
-
-date-fns@^2.29.1:
-  version "2.29.3"
-  resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.29.3.tgz#27402d2fc67eb442b511b70bbdf98e6411cd68a8"
-  integrity sha512-dDCnyH2WnnKusqvZZ6+jA1O51Ibt8ZMRNkDZdyAyK4YfbDwa/cEmuztzG5pk6hqlp9aSBPYcjOlktquahGwGeA==
+    whatwg-url "^12.0.0"
 
 debug@4, debug@4.3.4, debug@^4, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.3, debug@^4.3.4:
   version "4.3.4"
@@ -3056,20 +2757,15 @@ debug@^3.2.7:
   dependencies:
     ms "^2.1.1"
 
-decamelize@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
-  integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=
-
 decamelize@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-4.0.0.tgz#aa472d7bf660eb15f3494efd531cab7f2a709837"
   integrity sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ==
 
-decimal.js@^10.3.1:
-  version "10.3.1"
-  resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.3.1.tgz#d8c3a444a9c6774ba60ca6ad7261c3a94fd5e783"
-  integrity sha512-V0pfhfr8suzyPGOx3nmq4aHqabehUZn6Ch9kyFpV79TGDTWFmHqUqXdabR7QHqxzrYolF4+tVmJhUG4OURg5dQ==
+decimal.js@^10.4.3:
+  version "10.4.3"
+  resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.4.3.tgz#1044092884d245d1b7f65725fa4ad4c6f781cc23"
+  integrity sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA==
 
 decompress-response@^6.0.0:
   version "6.0.0"
@@ -3095,18 +2791,11 @@ deep-extend@^0.6.0:
   resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac"
   integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==
 
-deep-is@^0.1.3, deep-is@~0.1.3:
+deep-is@^0.1.3:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831"
   integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==
 
-default-require-extensions@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/default-require-extensions/-/default-require-extensions-3.0.0.tgz#e03f93aac9b2b6443fc52e5e4a37b3ad9ad8df96"
-  integrity sha512-ek6DpXq/SCpvjhpFsLFRVtIxJCRw6fUR42lYMVZuUMK7n8eMz4Uh5clckdBjEpLhn/gEBZo7hDJnJcwdKLKQjg==
-  dependencies:
-    strip-bom "^4.0.0"
-
 defer-to-connect@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-2.0.1.tgz#8016bdb4143e4632b77a3449c6236277de520587"
@@ -3117,15 +2806,7 @@ define-lazy-prop@^2.0.0:
   resolved "https://registry.yarnpkg.com/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz#3f7ae421129bcaaac9bc74905c98a0009ec9ee7f"
   integrity sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==
 
-define-properties@^1.1.3, define-properties@^1.1.4:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.4.tgz#0b14d7bd7fbeb2f3572c3a7eda80ea5d57fb05b1"
-  integrity sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==
-  dependencies:
-    has-property-descriptors "^1.0.0"
-    object-keys "^1.1.1"
-
-define-properties@^1.2.0:
+define-properties@^1.1.3, define-properties@^1.1.4, define-properties@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.2.0.tgz#52988570670c9eacedd8064f4a990f2405849bd5"
   integrity sha512-xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA==
@@ -3143,11 +2824,6 @@ delegates@^1.0.0:
   resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
   integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=
 
-depd@^1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
-  integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=
-
 detect-node@^2.0.4:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.1.0.tgz#c9c70775a49c3d03bc2c06d9a73be550f978f8b1"
@@ -3418,13 +3094,6 @@ encoding@0.1.12:
   dependencies:
     iconv-lite "~0.4.13"
 
-encoding@^0.1.13:
-  version "0.1.13"
-  resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.13.tgz#56574afdd791f54a8e9b2785c0582a2d26210fa9"
-  integrity sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==
-  dependencies:
-    iconv-lite "^0.6.2"
-
 end-of-stream@^1.1.0:
   version "1.4.4"
   resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0"
@@ -3440,28 +3109,26 @@ enhanced-resolve@^5.0.0, enhanced-resolve@^5.10.0:
     graceful-fs "^4.2.4"
     tapable "^2.2.0"
 
+entities@^4.4.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/entities/-/entities-4.5.0.tgz#5d268ea5e7113ec74c4d033b79ea5a35a488fb48"
+  integrity sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==
+
 env-paths@^2.2.0:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.1.tgz#420399d416ce1fbe9bc0a07c62fa68d67fd0f8f2"
   integrity sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==
 
 envinfo@^7.7.3:
-  version "7.8.1"
-  resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-7.8.1.tgz#06377e3e5f4d379fea7ac592d5ad8927e0c4d475"
-  integrity sha512-/o+BXHmB7ocbHEAs6F2EnG0ogybVVUdkRunTT2glZU9XAaGmhqskrvKwqXuDfNjEO0LZKWdejEEpnq8aM0tOaw==
+  version "7.10.0"
+  resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-7.10.0.tgz#55146e3909cc5fe63c22da63fb15b05aeac35b13"
+  integrity sha512-ZtUjZO6l5mwTHvc1L9+1q5p/R3wTopcfqMW8r5t8SJSKqeVI/LtajORwRFEKpEFuekjD0VBjwu1HMxL4UalIRw==
 
 err-code@^2.0.2:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/err-code/-/err-code-2.0.3.tgz#23c2f3b756ffdfc608d30e27c9a941024807e7f9"
   integrity sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==
 
-error-ex@^1.3.1:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf"
-  integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==
-  dependencies:
-    is-arrayish "^0.2.1"
-
 error-stack-parser@^2.0.6:
   version "2.0.7"
   resolved "https://registry.yarnpkg.com/error-stack-parser/-/error-stack-parser-2.0.7.tgz#b0c6e2ce27d0495cf78ad98715e0cad1219abb57"
@@ -3469,36 +3136,7 @@ error-stack-parser@^2.0.6:
   dependencies:
     stackframe "^1.1.1"
 
-es-abstract@^1.19.0, es-abstract@^1.19.1, es-abstract@^1.19.5:
-  version "1.20.1"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.20.1.tgz#027292cd6ef44bd12b1913b828116f54787d1814"
-  integrity sha512-WEm2oBhfoI2sImeM4OF2zE2V3BYdSF+KnSi9Sidz51fQHd7+JuF8Xgcj9/0o+OWeIeIS/MiuNnlruQrJf16GQA==
-  dependencies:
-    call-bind "^1.0.2"
-    es-to-primitive "^1.2.1"
-    function-bind "^1.1.1"
-    function.prototype.name "^1.1.5"
-    get-intrinsic "^1.1.1"
-    get-symbol-description "^1.0.0"
-    has "^1.0.3"
-    has-property-descriptors "^1.0.0"
-    has-symbols "^1.0.3"
-    internal-slot "^1.0.3"
-    is-callable "^1.2.4"
-    is-negative-zero "^2.0.2"
-    is-regex "^1.1.4"
-    is-shared-array-buffer "^1.0.2"
-    is-string "^1.0.7"
-    is-weakref "^1.0.2"
-    object-inspect "^1.12.0"
-    object-keys "^1.1.1"
-    object.assign "^4.1.2"
-    regexp.prototype.flags "^1.4.3"
-    string.prototype.trimend "^1.0.5"
-    string.prototype.trimstart "^1.0.5"
-    unbox-primitive "^1.0.2"
-
-es-abstract@^1.20.4:
+es-abstract@^1.19.0, es-abstract@^1.20.4:
   version "1.22.1"
   resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.22.1.tgz#8b4e5fc5cefd7f1660f0f8e1a52900dfbc9d9ccc"
   integrity sha512-ioRRcXMO6OFyRpyzV3kE1IIBd4WG5/kltnzdxSCqoP8CMGs/Li+M1uF5o7lOkZVFjDs+NLesthnF66Pg/0q0Lw==
@@ -3573,137 +3211,11 @@ es-to-primitive@^1.2.1:
     is-date-object "^1.0.1"
     is-symbol "^1.0.2"
 
-es6-error@^4.0.1, es6-error@^4.1.1:
+es6-error@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/es6-error/-/es6-error-4.1.1.tgz#9e3af407459deed47e9a91f9b885a84eb05c561d"
   integrity sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==
 
-esbuild-android-64@0.14.39:
-  version "0.14.39"
-  resolved "https://registry.yarnpkg.com/esbuild-android-64/-/esbuild-android-64-0.14.39.tgz#09f12a372eed9743fd77ff6d889ac14f7b340c21"
-  integrity sha512-EJOu04p9WgZk0UoKTqLId9VnIsotmI/Z98EXrKURGb3LPNunkeffqQIkjS2cAvidh+OK5uVrXaIP229zK6GvhQ==
-
-esbuild-android-arm64@0.14.39:
-  version "0.14.39"
-  resolved "https://registry.yarnpkg.com/esbuild-android-arm64/-/esbuild-android-arm64-0.14.39.tgz#f608d00ea03fe26f3b1ab92a30f99220390f3071"
-  integrity sha512-+twajJqO7n3MrCz9e+2lVOnFplRsaGRwsq1KL/uOy7xK7QdRSprRQcObGDeDZUZsacD5gUkk6OiHiYp6RzU3CA==
-
-esbuild-darwin-64@0.14.39:
-  version "0.14.39"
-  resolved "https://registry.yarnpkg.com/esbuild-darwin-64/-/esbuild-darwin-64-0.14.39.tgz#31528daa75b4c9317721ede344195163fae3e041"
-  integrity sha512-ImT6eUw3kcGcHoUxEcdBpi6LfTRWaV6+qf32iYYAfwOeV+XaQ/Xp5XQIBiijLeo+LpGci9M0FVec09nUw41a5g==
-
-esbuild-darwin-arm64@0.14.39:
-  version "0.14.39"
-  resolved "https://registry.yarnpkg.com/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.14.39.tgz#247f770d86d90a215fa194f24f90e30a0bd97245"
-  integrity sha512-/fcQ5UhE05OiT+bW5v7/up1bDsnvaRZPJxXwzXsMRrr7rZqPa85vayrD723oWMT64dhrgWeA3FIneF8yER0XTw==
-
-esbuild-freebsd-64@0.14.39:
-  version "0.14.39"
-  resolved "https://registry.yarnpkg.com/esbuild-freebsd-64/-/esbuild-freebsd-64-0.14.39.tgz#479414d294905055eb396ebe455ed42213284ee0"
-  integrity sha512-oMNH8lJI4wtgN5oxuFP7BQ22vgB/e3Tl5Woehcd6i2r6F3TszpCnNl8wo2d/KvyQ4zvLvCWAlRciumhQg88+kQ==
-
-esbuild-freebsd-arm64@0.14.39:
-  version "0.14.39"
-  resolved "https://registry.yarnpkg.com/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.14.39.tgz#cedeb10357c88533615921ae767a67dc870a474c"
-  integrity sha512-1GHK7kwk57ukY2yI4ILWKJXaxfr+8HcM/r/JKCGCPziIVlL+Wi7RbJ2OzMcTKZ1HpvEqCTBT/J6cO4ZEwW4Ypg==
-
-esbuild-linux-32@0.14.39:
-  version "0.14.39"
-  resolved "https://registry.yarnpkg.com/esbuild-linux-32/-/esbuild-linux-32-0.14.39.tgz#d9f008c4322d771f3958f59c1eee5a05cdf92485"
-  integrity sha512-g97Sbb6g4zfRLIxHgW2pc393DjnkTRMeq3N1rmjDUABxpx8SjocK4jLen+/mq55G46eE2TA0MkJ4R3SpKMu7dg==
-
-esbuild-linux-64@0.14.39:
-  version "0.14.39"
-  resolved "https://registry.yarnpkg.com/esbuild-linux-64/-/esbuild-linux-64-0.14.39.tgz#ba58d7f66858913aeb1ab5c6bde1bbd824731795"
-  integrity sha512-4tcgFDYWdI+UbNMGlua9u1Zhu0N5R6u9tl5WOM8aVnNX143JZoBZLpCuUr5lCKhnD0SCO+5gUyMfupGrHtfggQ==
-
-esbuild-linux-arm64@0.14.39:
-  version "0.14.39"
-  resolved "https://registry.yarnpkg.com/esbuild-linux-arm64/-/esbuild-linux-arm64-0.14.39.tgz#708785a30072702b5b1c16b65cf9c25c51202529"
-  integrity sha512-23pc8MlD2D6Px1mV8GMglZlKgwgNKAO8gsgsLLcXWSs9lQsCYkIlMo/2Ycfo5JrDIbLdwgP8D2vpfH2KcBqrDQ==
-
-esbuild-linux-arm@0.14.39:
-  version "0.14.39"
-  resolved "https://registry.yarnpkg.com/esbuild-linux-arm/-/esbuild-linux-arm-0.14.39.tgz#4e8b5deaa7ab60d0d28fab131244ef82b40684f4"
-  integrity sha512-t0Hn1kWVx5UpCzAJkKRfHeYOLyFnXwYynIkK54/h3tbMweGI7dj400D1k0Vvtj2u1P+JTRT9tx3AjtLEMmfVBQ==
-
-esbuild-linux-mips64le@0.14.39:
-  version "0.14.39"
-  resolved "https://registry.yarnpkg.com/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.14.39.tgz#6f3bf3023f711084e5a1e8190487d2020f39f0f7"
-  integrity sha512-epwlYgVdbmkuRr5n4es3B+yDI0I2e/nxhKejT9H0OLxFAlMkeQZxSpxATpDc9m8NqRci6Kwyb/SfmD1koG2Zuw==
-
-esbuild-linux-ppc64le@0.14.39:
-  version "0.14.39"
-  resolved "https://registry.yarnpkg.com/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.14.39.tgz#900e718a4ea3f6aedde8424828eeefdd4b48d4b9"
-  integrity sha512-W/5ezaq+rQiQBThIjLMNjsuhPHg+ApVAdTz2LvcuesZFMsJoQAW2hutoyg47XxpWi7aEjJGrkS26qCJKhRn3QQ==
-
-esbuild-linux-riscv64@0.14.39:
-  version "0.14.39"
-  resolved "https://registry.yarnpkg.com/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.14.39.tgz#dcbff622fa37047a75d2ff7a1d8d2949d80277e4"
-  integrity sha512-IS48xeokcCTKeQIOke2O0t9t14HPvwnZcy+5baG13Z1wxs9ZrC5ig5ypEQQh4QMKxURD5TpCLHw2W42CLuVZaA==
-
-esbuild-linux-s390x@0.14.39:
-  version "0.14.39"
-  resolved "https://registry.yarnpkg.com/esbuild-linux-s390x/-/esbuild-linux-s390x-0.14.39.tgz#3f725a7945b419406c99d93744b28552561dcdfd"
-  integrity sha512-zEfunpqR8sMomqXhNTFEKDs+ik7HC01m3M60MsEjZOqaywHu5e5682fMsqOlZbesEAAaO9aAtRBsU7CHnSZWyA==
-
-esbuild-netbsd-64@0.14.39:
-  version "0.14.39"
-  resolved "https://registry.yarnpkg.com/esbuild-netbsd-64/-/esbuild-netbsd-64-0.14.39.tgz#e10e40b6a765798b90d4eb85901cc85c8b7ff85e"
-  integrity sha512-Uo2suJBSIlrZCe4E0k75VDIFJWfZy+bOV6ih3T4MVMRJh1lHJ2UyGoaX4bOxomYN3t+IakHPyEoln1+qJ1qYaA==
-
-esbuild-openbsd-64@0.14.39:
-  version "0.14.39"
-  resolved "https://registry.yarnpkg.com/esbuild-openbsd-64/-/esbuild-openbsd-64-0.14.39.tgz#935ec143f75ce10bd9cdb1c87fee00287eb0edbc"
-  integrity sha512-secQU+EpgUPpYjJe3OecoeGKVvRMLeKUxSMGHnK+aK5uQM3n1FPXNJzyz1LHFOo0WOyw+uoCxBYdM4O10oaCAA==
-
-esbuild-sunos-64@0.14.39:
-  version "0.14.39"
-  resolved "https://registry.yarnpkg.com/esbuild-sunos-64/-/esbuild-sunos-64-0.14.39.tgz#0e7aa82b022a2e6d55b0646738b2582c2d72c3c0"
-  integrity sha512-qHq0t5gePEDm2nqZLb+35p/qkaXVS7oIe32R0ECh2HOdiXXkj/1uQI9IRogGqKkK+QjDG+DhwiUw7QoHur/Rwg==
-
-esbuild-windows-32@0.14.39:
-  version "0.14.39"
-  resolved "https://registry.yarnpkg.com/esbuild-windows-32/-/esbuild-windows-32-0.14.39.tgz#3f1538241f31b538545f4b5841b248cac260fa35"
-  integrity sha512-XPjwp2OgtEX0JnOlTgT6E5txbRp6Uw54Isorm3CwOtloJazeIWXuiwK0ONJBVb/CGbiCpS7iP2UahGgd2p1x+Q==
-
-esbuild-windows-64@0.14.39:
-  version "0.14.39"
-  resolved "https://registry.yarnpkg.com/esbuild-windows-64/-/esbuild-windows-64-0.14.39.tgz#b100c59f96d3c2da2e796e42fee4900d755d3e03"
-  integrity sha512-E2wm+5FwCcLpKsBHRw28bSYQw0Ikxb7zIMxw3OPAkiaQhLVr3dnVO8DofmbWhhf6b97bWzg37iSZ45ZDpLw7Ow==
-
-esbuild-windows-arm64@0.14.39:
-  version "0.14.39"
-  resolved "https://registry.yarnpkg.com/esbuild-windows-arm64/-/esbuild-windows-arm64-0.14.39.tgz#00268517e665b33c89778d61f144e4256b39f631"
-  integrity sha512-sBZQz5D+Gd0EQ09tZRnz/PpVdLwvp/ufMtJ1iDFYddDaPpZXKqPyaxfYBLs3ueiaksQ26GGa7sci0OqFzNs7KA==
-
-esbuild@^0.14.29:
-  version "0.14.39"
-  resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.14.39.tgz#c926b2259fe6f6d3a94f528fb42e103c5a6d909a"
-  integrity sha512-2kKujuzvRWYtwvNjYDY444LQIA3TyJhJIX3Yo4+qkFlDDtGlSicWgeHVJqMUP/2sSfH10PGwfsj+O2ro1m10xQ==
-  optionalDependencies:
-    esbuild-android-64 "0.14.39"
-    esbuild-android-arm64 "0.14.39"
-    esbuild-darwin-64 "0.14.39"
-    esbuild-darwin-arm64 "0.14.39"
-    esbuild-freebsd-64 "0.14.39"
-    esbuild-freebsd-arm64 "0.14.39"
-    esbuild-linux-32 "0.14.39"
-    esbuild-linux-64 "0.14.39"
-    esbuild-linux-arm "0.14.39"
-    esbuild-linux-arm64 "0.14.39"
-    esbuild-linux-mips64le "0.14.39"
-    esbuild-linux-ppc64le "0.14.39"
-    esbuild-linux-riscv64 "0.14.39"
-    esbuild-linux-s390x "0.14.39"
-    esbuild-netbsd-64 "0.14.39"
-    esbuild-openbsd-64 "0.14.39"
-    esbuild-sunos-64 "0.14.39"
-    esbuild-windows-32 "0.14.39"
-    esbuild-windows-64 "0.14.39"
-    esbuild-windows-arm64 "0.14.39"
-
 escalade@^3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40"
@@ -3729,18 +3241,6 @@ escape-string-regexp@^2.0.0:
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz#a30304e99daa32e23b2fd20f51babd07cffca344"
   integrity sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==
 
-escodegen@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-2.0.0.tgz#5e32b12833e8aa8fa35e1bf0befa89380484c7dd"
-  integrity sha512-mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw==
-  dependencies:
-    esprima "^4.0.1"
-    estraverse "^5.2.0"
-    esutils "^2.0.2"
-    optionator "^0.8.1"
-  optionalDependencies:
-    source-map "~0.6.1"
-
 eslint-config-airbnb-base@^15.0.0:
   version "15.0.0"
   resolved "https://registry.yarnpkg.com/eslint-config-airbnb-base/-/eslint-config-airbnb-base-15.0.0.tgz#6b09add90ac79c2f8d723a2580e07f3925afd236"
@@ -3860,12 +3360,7 @@ eslint-visitor-keys@^2.0.0:
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303"
   integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==
 
-eslint-visitor-keys@^3.3.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz#f6480fa6b1f30efe2d1968aa8ac745b862469826"
-  integrity sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==
-
-eslint-visitor-keys@^3.4.1:
+eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.1:
   version "3.4.1"
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.1.tgz#c22c48f48942d08ca824cc526211ae400478a994"
   integrity sha512-pZnmmLwYzf+kWaM/Qgrvpen51upAktaaiI01nsJD/Yr3lMOdNtq0cxkrrg16w64VtisN6okbs7Q8AfGqj4c9fA==
@@ -3922,11 +3417,6 @@ espree@^9.6.0:
     acorn-jsx "^5.3.2"
     eslint-visitor-keys "^3.4.1"
 
-esprima@^4.0.0, esprima@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
-  integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
-
 esquery@^1.4.2:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.5.0.tgz#6ce17738de8577694edd7361c57182ac8cb0db0b"
@@ -4030,7 +3520,7 @@ fast-json-stable-stringify@^2.0.0:
   resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633"
   integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==
 
-fast-levenshtein@^2.0.6, fast-levenshtein@~2.0.6:
+fast-levenshtein@^2.0.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
   integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=
@@ -4108,15 +3598,6 @@ fill-range@^7.0.1:
   dependencies:
     to-regex-range "^5.0.1"
 
-find-cache-dir@^3.2.0:
-  version "3.3.2"
-  resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.3.2.tgz#b30c5b6eff0730731aea9bbd9dbecbd80256d64b"
-  integrity sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==
-  dependencies:
-    commondir "^1.0.1"
-    make-dir "^3.0.2"
-    pkg-dir "^4.1.0"
-
 find-up@5.0.0, find-up@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz#4c92819ecb7083561e4f4a240a86be5198f536fc"
@@ -4125,7 +3606,7 @@ find-up@5.0.0, find-up@^5.0.0:
     locate-path "^6.0.0"
     path-exists "^4.0.0"
 
-find-up@^4.0.0, find-up@^4.1.0:
+find-up@^4.0.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19"
   integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==
@@ -4175,14 +3656,6 @@ for-each@^0.3.3:
   dependencies:
     is-callable "^1.1.3"
 
-foreground-child@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/foreground-child/-/foreground-child-2.0.0.tgz#71b32800c9f15aa8f2f83f4a6bd9bff35d861a53"
-  integrity sha512-dCIq9FpEcyQyXKCkyzmlPTFNgrCzPudOe+mhvJU5zAtlBnGVy2yKxtfsxK2tQBThwq225jcvBjpw1Gr40uzZCA==
-  dependencies:
-    cross-spawn "^7.0.0"
-    signal-exit "^3.0.2"
-
 form-data@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/form-data/-/form-data-3.0.1.tgz#ebd53791b78356a99af9a300d4282c4d5eb9755f"
@@ -4201,11 +3674,6 @@ form-data@^4.0.0:
     combined-stream "^1.0.8"
     mime-types "^2.1.12"
 
-fromentries@^1.2.0:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/fromentries/-/fromentries-1.3.2.tgz#e4bca6808816bf8f93b52750f1127f5a6fd86e3a"
-  integrity sha512-cHEpEQHUg0f8XdtZCc2ZAhrHzKzT0MrFUTcvx+hfxYu7rGMDc5SKoXFh+n4YigxsHXRzc6OrCshdR1bWH6HHyg==
-
 fs-extra@9.0.0:
   version "9.0.0"
   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.0.0.tgz#b6afc31036e247b2466dc99c29ae797d5d4580a3"
@@ -4253,7 +3721,7 @@ fs-extra@^9.0.0, fs-extra@^9.0.1:
     jsonfile "^6.0.1"
     universalify "^2.0.0"
 
-fs-minipass@^2.0.0, fs-minipass@^2.1.0:
+fs-minipass@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz#7f5036fdbf12c63c169190cbe4199c852271f9fb"
   integrity sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==
@@ -4309,7 +3777,7 @@ gensync@^1.0.0-beta.2:
   resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0"
   integrity sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==
 
-get-caller-file@^2.0.1, get-caller-file@^2.0.5:
+get-caller-file@^2.0.5:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
   integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
@@ -4319,16 +3787,7 @@ get-func-name@^2.0.0:
   resolved "https://registry.yarnpkg.com/get-func-name/-/get-func-name-2.0.0.tgz#ead774abee72e20409433a066366023dd6887a41"
   integrity sha1-6td0q+5y4gQJQzoGY2YCPdaIekE=
 
-get-intrinsic@^1.0.2, get-intrinsic@^1.1.0, get-intrinsic@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.1.tgz#15f59f376f855c446963948f0d24cd3637b4abc6"
-  integrity sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==
-  dependencies:
-    function-bind "^1.1.1"
-    has "^1.0.3"
-    has-symbols "^1.0.1"
-
-get-intrinsic@^1.1.3, get-intrinsic@^1.2.0, get-intrinsic@^1.2.1:
+get-intrinsic@^1.0.2, get-intrinsic@^1.1.1, get-intrinsic@^1.1.3, get-intrinsic@^1.2.0, get-intrinsic@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.1.tgz#d295644fed4505fc9cde952c37ee12b477a83d82"
   integrity sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==
@@ -4338,11 +3797,6 @@ get-intrinsic@^1.1.3, get-intrinsic@^1.2.0, get-intrinsic@^1.2.1:
     has-proto "^1.0.1"
     has-symbols "^1.0.3"
 
-get-package-type@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/get-package-type/-/get-package-type-0.1.0.tgz#8de2d803cff44df3bc6c456e6668b36c3926e11a"
-  integrity sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==
-
 get-stream@^5.0.0, get-stream@^5.1.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-5.2.0.tgz#4966a1795ee5ace65e706c4b7beb71257d6e22d3"
@@ -4410,7 +3864,7 @@ glob@^6.0.1:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@^7.0.5, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6:
+glob@^7.0.5, glob@^7.1.3, glob@^7.1.6:
   version "7.2.3"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b"
   integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==
@@ -4422,17 +3876,6 @@ glob@^7.0.5, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@^8.0.1:
-  version "8.0.3"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-8.0.3.tgz#415c6eb2deed9e502c68fa44a272e6da6eeca42e"
-  integrity sha512-ull455NHSHI/Y1FqGaaYFaLGkNMMJbavMrEGFXG/PGrg6y7sutWHUHrz6gy6WEBH6akM1M414dWKCNs+IhKdiQ==
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^5.0.1"
-    once "^1.3.0"
-
 global-agent@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/global-agent/-/global-agent-3.0.0.tgz#ae7cd31bd3583b93c5a16437a1afe27cc33a1ab6"
@@ -4507,7 +3950,7 @@ got@^11.8.5, got@^9.6.0:
     p-cancelable "^2.0.0"
     responselike "^2.0.0"
 
-graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4, graceful-fs@^4.2.6, graceful-fs@^4.2.9:
+graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4, graceful-fs@^4.2.9:
   version "4.2.10"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c"
   integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==
@@ -4556,7 +3999,7 @@ has-proto@^1.0.1:
   resolved "https://registry.yarnpkg.com/has-proto/-/has-proto-1.0.1.tgz#1885c1305538958aff469fef37937c22795408e0"
   integrity sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==
 
-has-symbols@^1.0.1, has-symbols@^1.0.2, has-symbols@^1.0.3:
+has-symbols@^1.0.2, has-symbols@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz#bb7b2c4349251dce87b125f7bdf874aa7c8b39f8"
   integrity sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==
@@ -4585,14 +4028,6 @@ has@^1.0.3:
   dependencies:
     function-bind "^1.1.1"
 
-hasha@^5.0.0:
-  version "5.2.2"
-  resolved "https://registry.yarnpkg.com/hasha/-/hasha-5.2.2.tgz#a48477989b3b327aea3c04f53096d816d97522a1"
-  integrity sha512-Hrp5vIK/xr5SkeN2onO32H0MgNZ0f17HRNH39WfL0SYUNOTZ5Lz1TJ8Pajo/87dYGEFlLMm7mIc/k/s6Bvz9HQ==
-  dependencies:
-    is-stream "^2.0.0"
-    type-fest "^0.8.0"
-
 he@1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f"
@@ -4619,12 +4054,7 @@ html-encoding-sniffer@^3.0.0:
   dependencies:
     whatwg-encoding "^2.0.0"
 
-html-escaper@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.2.tgz#dfd60027da36a36dfcbe236262c00a5822681453"
-  integrity sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==
-
-http-cache-semantics@^4.0.0, http-cache-semantics@^4.1.0, http-cache-semantics@^4.1.1:
+http-cache-semantics@^4.0.0, http-cache-semantics@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz#abe02fcb2985460bf0323be664436ec3476a6d5a"
   integrity sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==
@@ -4646,7 +4076,7 @@ http2-wrapper@^1.0.0-beta.5.2:
     quick-lru "^5.1.1"
     resolve-alpn "^1.0.0"
 
-https-proxy-agent@^5.0.0:
+https-proxy-agent@^5.0.0, https-proxy-agent@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz#c59ef224a04fe8b754f3db0063a25ea30d0005d6"
   integrity sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==
@@ -4659,13 +4089,6 @@ human-signals@^1.1.1:
   resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-1.1.1.tgz#c5b1cd14f50aeae09ab6c59fe63ba3395fe4dfa3"
   integrity sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==
 
-humanize-ms@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/humanize-ms/-/humanize-ms-1.2.1.tgz#c46e3159a293f6b896da29316d8b6fe8bb79bbed"
-  integrity sha1-xG4xWaKT9riW2ikxbYtv6Lt5u+0=
-  dependencies:
-    ms "^2.0.0"
-
 hyphenate-style-name@^1.0.2:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/hyphenate-style-name/-/hyphenate-style-name-1.0.4.tgz#691879af8e220aea5750e8827db4ef62a54e361d"
@@ -4698,17 +4121,12 @@ icss-utils@^5.0.0, icss-utils@^5.1.0:
   resolved "https://registry.yarnpkg.com/icss-utils/-/icss-utils-5.1.0.tgz#c6be6858abd013d768e98366ae47e25d5887b1ae"
   integrity sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==
 
-ieee754@^1.1.13, ieee754@^1.2.1:
+ieee754@^1.1.13:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352"
   integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==
 
-ignore@^5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.0.tgz#6d3bac8fa7fe0d45d9f9be7bac2fc279577e345a"
-  integrity sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==
-
-ignore@^5.2.4:
+ignore@^5.2.0, ignore@^5.2.4:
   version "5.2.4"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.4.tgz#a291c0c6178ff1b960befe47fcdec301674a6324"
   integrity sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==
@@ -4756,16 +4174,6 @@ imurmurhash@^0.1.4:
   resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
   integrity sha1-khi5srkoojixPcT7a21XbyMUU+o=
 
-indent-string@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251"
-  integrity sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==
-
-infer-owner@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/infer-owner/-/infer-owner-1.0.4.tgz#c4cefcaa8e51051c2a40ba2ce8a3d27295af9467"
-  integrity sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==
-
 inflight@^1.0.4:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
@@ -4791,16 +4199,7 @@ inline-style-prefixer@^6.0.0:
   dependencies:
     css-in-js-utils "^2.0.0"
 
-internal-slot@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.3.tgz#7347e307deeea2faac2ac6205d4bc7d34967f59c"
-  integrity sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA==
-  dependencies:
-    get-intrinsic "^1.1.0"
-    has "^1.0.3"
-    side-channel "^1.0.4"
-
-internal-slot@^1.0.5:
+internal-slot@^1.0.3, internal-slot@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.5.tgz#f2a2ee21f668f8627a4667f309dc0f4fb6674986"
   integrity sha512-Y+R5hJrzs52QCG2laLn4udYVnxsfny9CpOhNhUvk/SSSVyF6T27FzRbF0sroPidSu3X8oEAkOn2K804mjpt6UQ==
@@ -4847,16 +4246,6 @@ is-array-buffer@^3.0.1, is-array-buffer@^3.0.2:
     get-intrinsic "^1.2.0"
     is-typed-array "^1.1.10"
 
-is-arrayish@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
-  integrity sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=
-
-is-arrayish@^0.3.1:
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.3.2.tgz#4574a2ae56f7ab206896fb431eaeed066fdf8f03"
-  integrity sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==
-
 is-bigint@^1.0.1:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.4.tgz#08147a1875bc2b32005d41ccd8291dffc6691df3"
@@ -4879,16 +4268,11 @@ is-boolean-object@^1.1.0:
     call-bind "^1.0.2"
     has-tostringtag "^1.0.0"
 
-is-callable@^1.1.3, is-callable@^1.2.7:
+is-callable@^1.1.3, is-callable@^1.1.4, is-callable@^1.2.7:
   version "1.2.7"
   resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.7.tgz#3bc2a85ea742d9e36205dcacdd72ca1fdc51b055"
   integrity sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==
 
-is-callable@^1.1.4, is-callable@^1.2.4:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.4.tgz#47301d58dd0259407865547853df6d61fe471945"
-  integrity sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==
-
 is-ci@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-2.0.0.tgz#6bc6334181810e04b5c22b3d589fdca55026404c"
@@ -4910,13 +4294,6 @@ is-core-module@^2.11.0, is-core-module@^2.9.0:
   dependencies:
     has "^1.0.3"
 
-is-core-module@^2.8.1:
-  version "2.9.0"
-  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.9.0.tgz#e1c34429cd51c6dd9e09e0799e396e27b19a9c69"
-  integrity sha512-+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A==
-  dependencies:
-    has "^1.0.3"
-
 is-date-object@^1.0.1:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.5.tgz#0841d5536e724c25597bf6ea62e1bd38298df31f"
@@ -4954,11 +4331,6 @@ is-installed-globally@^0.4.0:
     global-dirs "^3.0.0"
     is-path-inside "^3.0.2"
 
-is-lambda@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-lambda/-/is-lambda-1.0.1.tgz#3d9877899e6a53efc0160504cde15f82e6f061d5"
-  integrity sha1-PZh3iZ5qU+/AFgUEzeFfgubwYdU=
-
 is-negative-zero@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.2.tgz#7bf6f03a28003b8b3965de3ac26f664d765f3150"
@@ -5066,11 +4438,6 @@ is-weakref@^1.0.2:
   dependencies:
     call-bind "^1.0.2"
 
-is-windows@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
-  integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==
-
 is-wsl@^2.1.1, is-wsl@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.2.0.tgz#74a4c76e77ca9fd3f932f290c17ea326cd157271"
@@ -5115,75 +4482,15 @@ isobject@^3.0.1:
   resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
   integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8=
 
-istanbul-lib-coverage@^3.0.0, istanbul-lib-coverage@^3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz#189e7909d0a39fa5a3dfad5b03f71947770191d3"
-  integrity sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw==
-
-istanbul-lib-hook@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-hook/-/istanbul-lib-hook-3.0.0.tgz#8f84c9434888cc6b1d0a9d7092a76d239ebf0cc6"
-  integrity sha512-Pt/uge1Q9s+5VAZ+pCo16TYMWPBIl+oaNIjgLQxcX0itS6ueeaA+pEfThZpH8WxhFgCiEb8sAJY6MdUKgiIWaQ==
+jake@^10.8.5:
+  version "10.8.5"
+  resolved "https://registry.yarnpkg.com/jake/-/jake-10.8.5.tgz#f2183d2c59382cb274226034543b9c03b8164c46"
+  integrity sha512-sVpxYeuAhWt0OTWITwT98oyV0GsXyMlXCF+3L1SuafBVUIr/uILGRB+NqwkzhgXKvoJpDIpQvqkUALgdmQsQxw==
   dependencies:
-    append-transform "^2.0.0"
-
-istanbul-lib-instrument@^4.0.0:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz#873c6fff897450118222774696a3f28902d77c1d"
-  integrity sha512-BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ==
-  dependencies:
-    "@babel/core" "^7.7.5"
-    "@istanbuljs/schema" "^0.1.2"
-    istanbul-lib-coverage "^3.0.0"
-    semver "^6.3.0"
-
-istanbul-lib-processinfo@^2.0.2:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-processinfo/-/istanbul-lib-processinfo-2.0.3.tgz#366d454cd0dcb7eb6e0e419378e60072c8626169"
-  integrity sha512-NkwHbo3E00oybX6NGJi6ar0B29vxyvNwoC7eJ4G4Yq28UfY758Hgn/heV8VRFhevPED4LXfFz0DQ8z/0kw9zMg==
-  dependencies:
-    archy "^1.0.0"
-    cross-spawn "^7.0.3"
-    istanbul-lib-coverage "^3.2.0"
-    p-map "^3.0.0"
-    rimraf "^3.0.0"
-    uuid "^8.3.2"
-
-istanbul-lib-report@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz#7518fe52ea44de372f460a76b5ecda9ffb73d8a6"
-  integrity sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw==
-  dependencies:
-    istanbul-lib-coverage "^3.0.0"
-    make-dir "^3.0.0"
-    supports-color "^7.1.0"
-
-istanbul-lib-source-maps@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz#895f3a709fcfba34c6de5a42939022f3e4358551"
-  integrity sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==
-  dependencies:
-    debug "^4.1.1"
-    istanbul-lib-coverage "^3.0.0"
-    source-map "^0.6.1"
-
-istanbul-reports@^3.0.2:
-  version "3.1.5"
-  resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-3.1.5.tgz#cc9a6ab25cb25659810e4785ed9d9fb742578bae"
-  integrity sha512-nUsEMa9pBt/NOHqbcbeJEgqIlY/K7rVWUX6Lql2orY5e9roQOthbR3vtY4zzf2orPELg80fnxxk9zUyPlgwD1w==
-  dependencies:
-    html-escaper "^2.0.0"
-    istanbul-lib-report "^3.0.0"
-
-jake@^10.8.5:
-  version "10.8.5"
-  resolved "https://registry.yarnpkg.com/jake/-/jake-10.8.5.tgz#f2183d2c59382cb274226034543b9c03b8164c46"
-  integrity sha512-sVpxYeuAhWt0OTWITwT98oyV0GsXyMlXCF+3L1SuafBVUIr/uILGRB+NqwkzhgXKvoJpDIpQvqkUALgdmQsQxw==
-  dependencies:
-    async "^3.2.3"
-    chalk "^4.0.2"
-    filelist "^1.0.1"
-    minimatch "^3.0.4"
+    async "^3.2.3"
+    chalk "^4.0.2"
+    filelist "^1.0.1"
+    minimatch "^3.0.4"
 
 jest-diff@^27.2.5, jest-diff@^27.5.1:
   version "27.5.1"
@@ -5271,50 +4578,38 @@ js-yaml@4.1.0, js-yaml@^4.1.0:
   dependencies:
     argparse "^2.0.1"
 
-js-yaml@^3.13.1:
-  version "3.14.1"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537"
-  integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==
-  dependencies:
-    argparse "^1.0.7"
-    esprima "^4.0.0"
-
 jsdom-global@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/jsdom-global/-/jsdom-global-3.0.2.tgz#6bd299c13b0c4626b2da2c0393cd4385d606acb9"
   integrity sha1-a9KZwTsMRiay2iwDk81DhdYGrLk=
 
-jsdom@^19.0.0:
-  version "19.0.0"
-  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-19.0.0.tgz#93e67c149fe26816d38a849ea30ac93677e16b6a"
-  integrity sha512-RYAyjCbxy/vri/CfnjUWJQQtZ3LKlLnDqj+9XLNnJPgEGeirZs3hllKR20re8LUZ6o1b1X4Jat+Qd26zmP41+A==
+jsdom@^22.1.0:
+  version "22.1.0"
+  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-22.1.0.tgz#0fca6d1a37fbeb7f4aac93d1090d782c56b611c8"
+  integrity sha512-/9AVW7xNbsBv6GfWho4TTNjEo9fe6Zhf9O7s0Fhhr3u+awPwAJMKwAMXnkk5vBxflqLW9hTHX/0cs+P3gW+cQw==
   dependencies:
-    abab "^2.0.5"
-    acorn "^8.5.0"
-    acorn-globals "^6.0.0"
-    cssom "^0.5.0"
-    cssstyle "^2.3.0"
-    data-urls "^3.0.1"
-    decimal.js "^10.3.1"
+    abab "^2.0.6"
+    cssstyle "^3.0.0"
+    data-urls "^4.0.0"
+    decimal.js "^10.4.3"
     domexception "^4.0.0"
-    escodegen "^2.0.0"
     form-data "^4.0.0"
     html-encoding-sniffer "^3.0.0"
     http-proxy-agent "^5.0.0"
-    https-proxy-agent "^5.0.0"
+    https-proxy-agent "^5.0.1"
     is-potential-custom-element-name "^1.0.1"
-    nwsapi "^2.2.0"
-    parse5 "6.0.1"
-    saxes "^5.0.1"
+    nwsapi "^2.2.4"
+    parse5 "^7.1.2"
+    rrweb-cssom "^0.6.0"
+    saxes "^6.0.0"
     symbol-tree "^3.2.4"
-    tough-cookie "^4.0.0"
-    w3c-hr-time "^1.0.2"
-    w3c-xmlserializer "^3.0.0"
+    tough-cookie "^4.1.2"
+    w3c-xmlserializer "^4.0.0"
     webidl-conversions "^7.0.0"
     whatwg-encoding "^2.0.0"
     whatwg-mimetype "^3.0.0"
-    whatwg-url "^10.0.0"
-    ws "^8.2.3"
+    whatwg-url "^12.0.1"
+    ws "^8.13.0"
     xml-name-validator "^4.0.0"
 
 jsesc@^2.5.1:
@@ -5327,7 +4622,7 @@ json-buffer@3.0.1, json-buffer@~3.0.1:
   resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.1.tgz#9338802a30d3b6605fbe0613e094008ca8c05a13"
   integrity sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==
 
-json-parse-even-better-errors@^2.3.0, json-parse-even-better-errors@^2.3.1:
+json-parse-even-better-errors@^2.3.1:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d"
   integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==
@@ -5418,7 +4713,7 @@ klaw-sync@^6.0.0:
   dependencies:
     graceful-fs "^4.1.11"
 
-klona@^2.0.5, klona@^2.0.6:
+klona@^2.0.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/klona/-/klona-2.0.6.tgz#85bffbf819c03b2f53270412420a4555ef882e22"
   integrity sha512-dhG34DXATL5hSxJbIexCft8FChFXtmskoZYnoPWjXQuebWYCNkVeV3KkGegCK9CP1oswI/vQibS2GY7Em/sJJA==
@@ -5457,14 +4752,6 @@ levn@^0.4.1:
     prelude-ls "^1.2.1"
     type-check "~0.4.0"
 
-levn@~0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
-  integrity sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=
-  dependencies:
-    prelude-ls "~1.1.2"
-    type-check "~0.3.2"
-
 "libsession_util_nodejs@https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.2.5/libsession_util_nodejs-v0.2.5.tar.gz":
   version "0.2.5"
   resolved "https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.2.5/libsession_util_nodejs-v0.2.5.tar.gz#e1db928eaca58f22c66494c6179e13bdd4e38cd4"
@@ -5484,11 +4771,6 @@ libsodium-wrappers-sumo@^0.7.9:
   dependencies:
     libsodium-sumo "^0.7.0"
 
-lines-and-columns@^1.1.6:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz#eca284f75d2965079309dc0ad9255abb2ebc1632"
-  integrity sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==
-
 linkify-it@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/linkify-it/-/linkify-it-4.0.1.tgz#01f1d5e508190d06669982ba31a7d9f56a5751ec"
@@ -5534,11 +4816,6 @@ lodash.escaperegexp@^4.1.2:
   resolved "https://registry.yarnpkg.com/lodash.escaperegexp/-/lodash.escaperegexp-4.1.2.tgz#64762c48618082518ac3df4ccf5d5886dae20347"
   integrity sha1-ZHYsSGGAglGKw99Mz11YhtriA0c=
 
-lodash.flattendeep@^4.4.0:
-  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz#fb030917f86a3134e5bc9bec0d69e0013ddfedb2"
-  integrity sha512-uHaJFihxmJcEX3kT4I23ABqKKalJ/zDrDg0lsFtc1h+3uw49SIJ5beyhx5ExVRti3AvKoOJngIj7xz3oylPdWQ==
-
 lodash.get@^4.4.2:
   version "4.4.2"
   resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99"
@@ -5608,40 +4885,13 @@ lru-cache@^6.0.0:
   dependencies:
     yallist "^4.0.0"
 
-lru-cache@^7.7.1:
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-7.10.1.tgz#db577f42a94c168f676b638d15da8fb073448cab"
-  integrity sha512-BQuhQxPuRl79J5zSXRP+uNzPOyZw2oFI9JLRQ80XswSvg21KMKNtQza9eF42rfI/3Z40RvzBdXgziEkudzjo8A==
-
-make-dir@^3.0.0, make-dir@^3.0.2:
+make-dir@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f"
   integrity sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==
   dependencies:
     semver "^6.0.0"
 
-make-fetch-happen@^10.0.3:
-  version "10.1.5"
-  resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-10.1.5.tgz#d975c0a4373de41ea05236d8182f56333511c268"
-  integrity sha512-mucOj2H0Jn/ax7H9K9T1bf0p1nn/mBFa551Os7ed9xRfLEx20aZhZeLslmRYfAaAqXZUGipcs+m5KOKvOH0XKA==
-  dependencies:
-    agentkeepalive "^4.2.1"
-    cacache "^16.1.0"
-    http-cache-semantics "^4.1.0"
-    http-proxy-agent "^5.0.0"
-    https-proxy-agent "^5.0.0"
-    is-lambda "^1.0.1"
-    lru-cache "^7.7.1"
-    minipass "^3.1.6"
-    minipass-collect "^1.0.2"
-    minipass-fetch "^2.0.3"
-    minipass-flush "^1.0.5"
-    minipass-pipeline "^1.2.4"
-    negotiator "^0.6.3"
-    promise-retry "^2.0.1"
-    socks-proxy-agent "^6.1.1"
-    ssri "^9.0.0"
-
 map-age-cleaner@^0.1.3:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz#7d583a7306434c055fe474b0f45078e6e1b4b92a"
@@ -5753,53 +5003,14 @@ minimist@^1.2.0, minimist@^1.2.6:
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44"
   integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==
 
-minipass-collect@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/minipass-collect/-/minipass-collect-1.0.2.tgz#22b813bf745dc6edba2576b940022ad6edc8c617"
-  integrity sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==
-  dependencies:
-    minipass "^3.0.0"
-
-minipass-fetch@^2.0.3:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/minipass-fetch/-/minipass-fetch-2.1.0.tgz#ca1754a5f857a3be99a9271277246ac0b44c3ff8"
-  integrity sha512-H9U4UVBGXEyyWJnqYDCLp1PwD8XIkJ4akNHp1aGVI+2Ym7wQMlxDKi4IB4JbmyU+pl9pEs/cVrK6cOuvmbK4Sg==
-  dependencies:
-    minipass "^3.1.6"
-    minipass-sized "^1.0.3"
-    minizlib "^2.1.2"
-  optionalDependencies:
-    encoding "^0.1.13"
-
-minipass-flush@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/minipass-flush/-/minipass-flush-1.0.5.tgz#82e7135d7e89a50ffe64610a787953c4c4cbb373"
-  integrity sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==
-  dependencies:
-    minipass "^3.0.0"
-
-minipass-pipeline@^1.2.4:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz#68472f79711c084657c067c5c6ad93cddea8214c"
-  integrity sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==
-  dependencies:
-    minipass "^3.0.0"
-
-minipass-sized@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/minipass-sized/-/minipass-sized-1.0.3.tgz#70ee5a7c5052070afacfbc22977ea79def353b70"
-  integrity sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g==
-  dependencies:
-    minipass "^3.0.0"
-
-minipass@^3.0.0, minipass@^3.1.1, minipass@^3.1.6:
+minipass@^3.0.0:
   version "3.1.6"
   resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.1.6.tgz#3b8150aa688a711a1521af5e8779c1d3bb4f45ee"
   integrity sha512-rty5kpw9/z8SX9dmxblFA6edItUmwJgMeYDZRrwlIVN27i8gysGbznJwUggw2V/FVqFSDdWy040ZPS811DYAqQ==
   dependencies:
     yallist "^4.0.0"
 
-minizlib@^2.1.1, minizlib@^2.1.2:
+minizlib@^2.1.1:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931"
   integrity sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==
@@ -5807,7 +5018,7 @@ minizlib@^2.1.1, minizlib@^2.1.2:
     minipass "^3.0.0"
     yallist "^4.0.0"
 
-mkdirp@^1.0.3, mkdirp@^1.0.4:
+mkdirp@^1.0.3:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
   integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
@@ -5862,16 +5073,11 @@ ms@2.1.2:
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
   integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
 
-ms@2.1.3, ms@^2.0.0, ms@^2.1.1, ms@^2.1.2:
+ms@2.1.3, ms@^2.1.1, ms@^2.1.2:
   version "2.1.3"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
   integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
 
-mustache@2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/mustache/-/mustache-2.3.0.tgz#4028f7778b17708a489930a6e52ac3bca0da41d0"
-  integrity sha1-QCj3d4sXcIpImTCm5SrDvKDaQdA=
-
 mv@~2:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/mv/-/mv-2.1.1.tgz#ae6ce0d6f6d5e0a4f7d893798d03c1ea9559b6a2"
@@ -5881,7 +5087,7 @@ mv@~2:
     ncp "~2.0.0"
     rimraf "~2.4.0"
 
-nan@^2.14.0, nan@^2.17.0:
+nan@^2.14.0:
   version "2.17.0"
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.17.0.tgz#c0150a2368a182f033e9aa5195ec76ea41a199cb"
   integrity sha512-2ZTgtl0nJsO0KQCjEpxcIr5D+Yv90plTitZt9JBfQvVJDS5seMl3FOvsh3+9CoYWXf/1l5OaZzzF6nDm4cagaQ==
@@ -5925,11 +5131,6 @@ ncp@~2.0.0:
   resolved "https://registry.yarnpkg.com/ncp/-/ncp-2.0.0.tgz#195a21d6c46e361d2fb1281ba38b91e9df7bdbb3"
   integrity sha1-GVoh1sRuNh0vsSgbo4uR6d9727M=
 
-negotiator@^0.6.3:
-  version "0.6.3"
-  resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd"
-  integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==
-
 neo-async@^2.6.2:
   version "2.6.2"
   resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f"
@@ -5973,22 +5174,6 @@ node-fetch@^2.6.7:
   dependencies:
     whatwg-url "^5.0.0"
 
-node-gyp@9.0.0:
-  version "9.0.0"
-  resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-9.0.0.tgz#e1da2067427f3eb5bb56820cb62bc6b1e4bd2089"
-  integrity sha512-Ma6p4s+XCTPxCuAMrOA/IJRmVy16R8Sdhtwl4PrCr7IBlj4cPawF0vg/l7nOT1jPbuNS7lIRJpBSvVsXwEZuzw==
-  dependencies:
-    env-paths "^2.2.0"
-    glob "^7.1.4"
-    graceful-fs "^4.2.6"
-    make-fetch-happen "^10.0.3"
-    nopt "^5.0.0"
-    npmlog "^6.0.0"
-    rimraf "^3.0.2"
-    semver "^7.3.5"
-    tar "^6.1.2"
-    which "^2.0.2"
-
 node-loader@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/node-loader/-/node-loader-2.0.0.tgz#9109a6d828703fd3e0aa03c1baec12a798071562"
@@ -5996,25 +5181,11 @@ node-loader@^2.0.0:
   dependencies:
     loader-utils "^2.0.0"
 
-node-preload@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/node-preload/-/node-preload-0.2.1.tgz#c03043bb327f417a18fee7ab7ee57b408a144301"
-  integrity sha512-RM5oyBy45cLEoHqCeh+MNuFAxO0vTFBLskvQbOKnEE7YTTSN4tbN8QWDIPQ6L+WvKsB/qLEGpYe2ZZ9d4W9OIQ==
-  dependencies:
-    process-on-spawn "^1.0.0"
-
 node-releases@^2.0.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.6.tgz#8a7088c63a55e493845683ebf3c828d8c51c5503"
   integrity sha512-PiVXnNuFm5+iYkLBNeq5211hvO38y63T0i2KKh2KnUs3RpzJ+JtODFjkD8yjLwnDkTYF1eKXheUwdssR+NRZdg==
 
-nopt@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/nopt/-/nopt-5.0.0.tgz#530942bb58a512fccafe53fe210f13a25355dc88"
-  integrity sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==
-  dependencies:
-    abbrev "1"
-
 normalize-path@^3.0.0, normalize-path@~3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"
@@ -6032,7 +5203,7 @@ npm-run-path@^4.0.0:
   dependencies:
     path-key "^3.0.0"
 
-npmlog@^6.0.0, npmlog@^6.0.2:
+npmlog@^6.0.2:
   version "6.0.2"
   resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-6.0.2.tgz#c8166017a42f2dea92d6453168dd865186a70830"
   integrity sha512-/vBvz5Jfr9dT/aFWd0FIRf+T/Q2WBsLENygUaFUqstqsycmZAP/t5BvFJTK0viFmSUxiUKTUplWy5vt+rvKIxg==
@@ -6042,55 +5213,17 @@ npmlog@^6.0.0, npmlog@^6.0.2:
     gauge "^4.0.3"
     set-blocking "^2.0.0"
 
-nwsapi@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.0.tgz#204879a9e3d068ff2a55139c2c772780681a38b7"
-  integrity sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ==
-
-nyc@^15.1.0:
-  version "15.1.0"
-  resolved "https://registry.yarnpkg.com/nyc/-/nyc-15.1.0.tgz#1335dae12ddc87b6e249d5a1994ca4bdaea75f02"
-  integrity sha512-jMW04n9SxKdKi1ZMGhvUTHBN0EICCRkHemEoE5jm6mTYcqcdas0ATzgUgejlQUHMvpnOZqGB5Xxsv9KxJW1j8A==
-  dependencies:
-    "@istanbuljs/load-nyc-config" "^1.0.0"
-    "@istanbuljs/schema" "^0.1.2"
-    caching-transform "^4.0.0"
-    convert-source-map "^1.7.0"
-    decamelize "^1.2.0"
-    find-cache-dir "^3.2.0"
-    find-up "^4.1.0"
-    foreground-child "^2.0.0"
-    get-package-type "^0.1.0"
-    glob "^7.1.6"
-    istanbul-lib-coverage "^3.0.0"
-    istanbul-lib-hook "^3.0.0"
-    istanbul-lib-instrument "^4.0.0"
-    istanbul-lib-processinfo "^2.0.2"
-    istanbul-lib-report "^3.0.0"
-    istanbul-lib-source-maps "^4.0.0"
-    istanbul-reports "^3.0.2"
-    make-dir "^3.0.0"
-    node-preload "^0.2.1"
-    p-map "^3.0.0"
-    process-on-spawn "^1.0.0"
-    resolve-from "^5.0.0"
-    rimraf "^3.0.0"
-    signal-exit "^3.0.2"
-    spawn-wrap "^2.0.0"
-    test-exclude "^6.0.0"
-    yargs "^15.0.2"
+nwsapi@^2.2.4:
+  version "2.2.7"
+  resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.7.tgz#738e0707d3128cb750dddcfe90e4610482df0f30"
+  integrity sha512-ub5E4+FBPKwAZx0UwIQOjYWGHTEq5sPqHQNRN8Z9e4A7u3Tj1weLJsL59yH9vmvqEtBHaOmT6cYQKIZOxp35FQ==
 
 object-assign@4.x, object-assign@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
   integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=
 
-object-inspect@^1.12.0, object-inspect@^1.9.0:
-  version "1.12.1"
-  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.1.tgz#28a661153bad7e470e4b01479ef1cb91ce511191"
-  integrity sha512-Y/jF6vnvEtOPGiKD1+q+X0CiUYRQtEHp89MLLUJ7TUivtH8Ugn2+3A7Rynqk7BRsAoqeOQWnFnjpDrKSxDgIGA==
-
-object-inspect@^1.12.3:
+object-inspect@^1.12.3, object-inspect@^1.9.0:
   version "1.12.3"
   resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.3.tgz#ba62dffd67ee256c8c086dfae69e016cd1f198b9"
   integrity sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==
@@ -6100,17 +5233,7 @@ object-keys@^1.1.1:
   resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
   integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
 
-object.assign@^4.1.0, object.assign@^4.1.2:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.2.tgz#0ed54a342eceb37b38ff76eb831a0e788cb63940"
-  integrity sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==
-  dependencies:
-    call-bind "^1.0.0"
-    define-properties "^1.1.3"
-    has-symbols "^1.0.1"
-    object-keys "^1.1.1"
-
-object.assign@^4.1.4:
+object.assign@^4.1.0, object.assign@^4.1.2, object.assign@^4.1.4:
   version "4.1.4"
   resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.4.tgz#9673c7c7c351ab8c4d0b516f4343ebf4dfb7799f"
   integrity sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==
@@ -6120,16 +5243,7 @@ object.assign@^4.1.4:
     has-symbols "^1.0.3"
     object-keys "^1.1.1"
 
-object.entries@^1.1.5:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.5.tgz#e1acdd17c4de2cd96d5a08487cfb9db84d881861"
-  integrity sha512-TyxmjUoZggd4OrrU1W66FMDG6CuqJxsFvymeyXI51+vQLN67zYfZseptRge703kKQdo4uccgAKebXFcRCzk4+g==
-  dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.1.3"
-    es-abstract "^1.19.1"
-
-object.entries@^1.1.6:
+object.entries@^1.1.5, object.entries@^1.1.6:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.6.tgz#9737d0e5b8291edd340a3e3264bb8a3b00d5fa23"
   integrity sha512-leTPzo4Zvg3pmbQ3rDK69Rl8GQvIqMWubrkxONG9/ojtFE2rD9fjMKfSI5BxW3osRH1m6VdzmqK8oAY9aT4x5w==
@@ -6195,18 +5309,6 @@ open@^8.3.0:
     is-docker "^2.1.1"
     is-wsl "^2.2.0"
 
-optionator@^0.8.1:
-  version "0.8.3"
-  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495"
-  integrity sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==
-  dependencies:
-    deep-is "~0.1.3"
-    fast-levenshtein "~2.0.6"
-    levn "~0.3.0"
-    prelude-ls "~1.1.2"
-    type-check "~0.3.2"
-    word-wrap "~1.2.3"
-
 optionator@^0.9.3:
   version "0.9.3"
   resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.3.tgz#007397d44ed1872fdc6ed31360190f81814e2c64"
@@ -6281,20 +5383,6 @@ p-locate@^5.0.0:
   dependencies:
     p-limit "^3.0.2"
 
-p-map@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/p-map/-/p-map-3.0.0.tgz#d704d9af8a2ba684e2600d9a215983d4141a979d"
-  integrity sha512-d3qXVTF/s+W+CdJ5A29wywV2n8CQQYahlgz2bFiA+4eVNJbHJodPZ+/gXwPGh0bOqA+j8S+6+ckmvLGPk1QpxQ==
-  dependencies:
-    aggregate-error "^3.0.0"
-
-p-map@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/p-map/-/p-map-4.0.0.tgz#bb2f95a5eda2ec168ec9274e06a747c3e2904d2b"
-  integrity sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==
-  dependencies:
-    aggregate-error "^3.0.0"
-
 p-retry@^4.2.0:
   version "4.6.2"
   resolved "https://registry.yarnpkg.com/p-retry/-/p-retry-4.6.2.tgz#9baae7184057edd4e17231cee04264106e092a16"
@@ -6308,16 +5396,6 @@ p-try@^2.0.0:
   resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6"
   integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==
 
-package-hash@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/package-hash/-/package-hash-4.0.0.tgz#3537f654665ec3cc38827387fc904c163c54f506"
-  integrity sha512-whdkPIooSu/bASggZ96BWVvZTRMOFxnyUG5PnTSGKoJE2gd5mbVNmR2Nj20QFzxYYgAXpoqC+AiXzl+UMRh7zQ==
-  dependencies:
-    graceful-fs "^4.1.15"
-    hasha "^5.0.0"
-    lodash.flattendeep "^4.4.0"
-    release-zalgo "^1.0.0"
-
 package-json@^6.3.0:
   version "6.5.0"
   resolved "https://registry.yarnpkg.com/package-json/-/package-json-6.5.0.tgz#6feedaca35e75725876d0b0e64974697fed145b0"
@@ -6335,20 +5413,12 @@ parent-module@^1.0.0:
   dependencies:
     callsites "^3.0.0"
 
-parse-json@^5.0.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.2.0.tgz#c76fc66dee54231c962b22bcc8a72cf2f99753cd"
-  integrity sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==
+parse5@^7.1.2:
+  version "7.1.2"
+  resolved "https://registry.yarnpkg.com/parse5/-/parse5-7.1.2.tgz#0736bebbfd77793823240a23b7fc5e010b7f8e32"
+  integrity sha512-Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw==
   dependencies:
-    "@babel/code-frame" "^7.0.0"
-    error-ex "^1.3.1"
-    json-parse-even-better-errors "^2.3.0"
-    lines-and-columns "^1.1.6"
-
-parse5@6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/parse5/-/parse5-6.0.1.tgz#e1a1c085c569b3dc08321184f19a39cc27f7c30b"
-  integrity sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==
+    entities "^4.4.0"
 
 patch-package@^6.4.7:
   version "6.4.7"
@@ -6448,7 +5518,7 @@ pixelmatch@^5.2.1:
   dependencies:
     pngjs "^6.0.0"
 
-pkg-dir@^4.1.0, pkg-dir@^4.2.0:
+pkg-dir@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3"
   integrity sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==
@@ -6502,15 +5572,6 @@ pngjs@^6.0.0:
   resolved "https://registry.yarnpkg.com/pngjs/-/pngjs-6.0.0.tgz#ca9e5d2aa48db0228a52c419c3308e87720da821"
   integrity sha512-TRzzuFRRmEoSW/p1KVAmiOgPco2Irlah+bGFCeNfJXxxYGwSw7YwAOAcd7X28K/m5bjBWKsC29KyoMfHbypayg==
 
-postcss-loader@^7.0.2:
-  version "7.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-7.0.2.tgz#b53ff44a26fba3688eee92a048c7f2d4802e23bb"
-  integrity sha512-fUJzV/QH7NXUAqV8dWJ9Lg4aTkDCezpTS5HgJ2DvqznexTbSTxgi/dTECvTZ15BwKTtk8G/bqI/QTu2HPd3ZCg==
-  dependencies:
-    cosmiconfig "^7.0.0"
-    klona "^2.0.5"
-    semver "^7.3.8"
-
 postcss-modules-extract-imports@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz#cda1f047c0ae80c97dbe28c3e76a43b88025741d"
@@ -6571,11 +5632,6 @@ prelude-ls@^1.2.1:
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396"
   integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==
 
-prelude-ls@~1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
-  integrity sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=
-
 prettier@1.19.0:
   version "1.19.0"
   resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.19.0.tgz#3bec4489d5eebcd52b95ddd2c22467b5c852fde1"
@@ -6590,28 +5646,11 @@ pretty-format@^27.2.5, pretty-format@^27.5.1:
     ansi-styles "^5.0.0"
     react-is "^17.0.1"
 
-process-on-spawn@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/process-on-spawn/-/process-on-spawn-1.0.0.tgz#95b05a23073d30a17acfdc92a440efd2baefdc93"
-  integrity sha512-1WsPDsUSMmZH5LeMLegqkPDrsGgsWwk1Exipy2hvB0o/F0ASzbpIctSCcZIK1ykJvtTJULEH+20WOFjMvGnCTg==
-  dependencies:
-    fromentries "^1.2.0"
-
-process@^0.11.10:
-  version "0.11.10"
-  resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
-  integrity sha1-czIwDoQBYb2j5podHZGn1LwW8YI=
-
 progress@^2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8"
   integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==
 
-promise-inflight@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3"
-  integrity sha512-6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g==
-
 promise-retry@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/promise-retry/-/promise-retry-2.0.1.tgz#ff747a13620ab57ba688f5fc67855410c370da22"
@@ -6663,9 +5702,9 @@ proxy-from-env@^1.1.0:
   integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==
 
 psl@^1.1.33, psl@^1.1.7:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz#9326f8bcfb013adcc005fdff056acce020e51c24"
-  integrity sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/psl/-/psl-1.9.0.tgz#d0df2a137f00794565fcaf3b2c00cd09f8d5a5a7"
+  integrity sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==
 
 pump@^3.0.0:
   version "3.0.0"
@@ -6675,10 +5714,10 @@ pump@^3.0.0:
     end-of-stream "^1.1.0"
     once "^1.3.1"
 
-punycode@^2.1.0, punycode@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
-  integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
+punycode@^2.1.0, punycode@^2.1.1, punycode@^2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.0.tgz#f67fa67c94da8f4d0cfff981aee4118064199b8f"
+  integrity sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==
 
 pupa@^2.1.1:
   version "2.1.1"
@@ -6692,16 +5731,16 @@ qr.js@0.0.0:
   resolved "https://registry.yarnpkg.com/qr.js/-/qr.js-0.0.0.tgz#cace86386f59a0db8050fa90d9b6b0e88a1e364f"
   integrity sha1-ys6GOG9ZoNuAUPqQ2baw6IoeNk8=
 
+querystringify@^2.1.1:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.2.0.tgz#3345941b4153cb9d082d8eee4cda2016a9aef7f6"
+  integrity sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==
+
 queue-microtask@^1.2.2:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243"
   integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==
 
-queue-promise@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/queue-promise/-/queue-promise-2.2.1.tgz#8de03fb79ba458efcb5ebf76368ab029d2669752"
-  integrity sha512-C3eyRwLF9m6dPV4MtqMVFX+Xmc7keZ9Ievm3jJ/wWM5t3uVbFnGsJXwpYzZ4LaIEcX9bss/mdaKzyrO6xheRuA==
-
 quick-lru@^5.1.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-5.1.1.tgz#366493e6b3e42a3a6885e2e99d18f80fb7a8c932"
@@ -6874,13 +5913,6 @@ react-mentions@^4.4.9:
     prop-types "^15.5.8"
     substyle "^9.1.0"
 
-react-portal@^4.2.0:
-  version "4.2.2"
-  resolved "https://registry.yarnpkg.com/react-portal/-/react-portal-4.2.2.tgz#bff1e024147d6041ba8c530ffc99d4c8248f49fa"
-  integrity sha512-vS18idTmevQxyQpnde0Td6ZcUlv+pD8GTyR42n3CHUQq9OHi1C4jDE4ZWEbEsrbrLRhSECYiao58cvocwMtP7Q==
-  dependencies:
-    prop-types "^15.5.8"
-
 react-qr-svg@^2.2.1:
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/react-qr-svg/-/react-qr-svg-2.4.0.tgz#c703d95907b9713192730a5bbeffb57e4aa782bd"
@@ -7053,21 +6085,7 @@ regenerator-runtime@^0.13.11, regenerator-runtime@^0.13.2:
   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz#f6dca3e7ceec20590d07ada785636a90cdca17f9"
   integrity sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==
 
-regenerator-runtime@^0.13.4:
-  version "0.13.9"
-  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz#8925742a98ffd90814988d7566ad30ca3b263b52"
-  integrity sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==
-
-regexp.prototype.flags@^1.4.3:
-  version "1.4.3"
-  resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz#87cab30f80f66660181a3bb7bf5981a872b367ac"
-  integrity sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==
-  dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.1.3"
-    functions-have-names "^1.2.2"
-
-regexp.prototype.flags@^1.5.0:
+regexp.prototype.flags@^1.4.3, regexp.prototype.flags@^1.5.0:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.5.0.tgz#fe7ce25e7e4cca8db37b6634c8a2c7009199b9cb"
   integrity sha512-0SutC3pNudRKgquxGoRGIz946MZVHqbNfPjBdxeOhBrdgDKlRoXmYLQN9xRbrR09ZXWeGAdPuif7egofn6v5LA==
@@ -7090,13 +6108,6 @@ registry-url@^5.0.0:
   dependencies:
     rc "^1.2.8"
 
-release-zalgo@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/release-zalgo/-/release-zalgo-1.0.0.tgz#09700b7e5074329739330e535c5a90fb67851730"
-  integrity sha512-gUAyHVHPPC5wdqX/LG4LWtRYtgjxyX78oanFNTMMyFEfOqdC54s3eE82imuWKbOeqYht2CrNf64Qb8vgmmtZGA==
-  dependencies:
-    es6-error "^4.0.1"
-
 require-directory@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
@@ -7107,10 +6118,10 @@ require-from-string@^2.0.2:
   resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909"
   integrity sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==
 
-require-main-filename@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b"
-  integrity sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==
+requires-port@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
+  integrity sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==
 
 reselect@^4.1.5:
   version "4.1.5"
@@ -7144,16 +6155,7 @@ resolve-from@^5.0.0:
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69"
   integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==
 
-resolve@^1.20.0:
-  version "1.22.0"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.0.tgz#5e0b8c67c15df57a89bdbabe603a002f21731198"
-  integrity sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==
-  dependencies:
-    is-core-module "^2.8.1"
-    path-parse "^1.0.7"
-    supports-preserve-symlinks-flag "^1.0.0"
-
-resolve@^1.22.1:
+resolve@^1.20.0, resolve@^1.22.1:
   version "1.22.2"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.2.tgz#0ed0943d4e301867955766c9f3e1ae6d01c6845f"
   integrity sha512-Sb+mjNHOULsBv818T40qSPeRiuWLyaGMa5ewydRLFimneixmVy2zdivRl+AF6jaYPC8ERxGDmFSiqui6SfPd+g==
@@ -7233,6 +6235,11 @@ roarr@^2.15.3:
     semver-compare "^1.0.0"
     sprintf-js "^1.1.2"
 
+rrweb-cssom@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/rrweb-cssom/-/rrweb-cssom-0.6.0.tgz#ed298055b97cbddcdeb278f904857629dec5e0e1"
+  integrity sha512-APM0Gt1KoXBz0iIkkdB/kfvGOwC4UuJFeG/c+yV7wSc7q96cG/kJ0HiYCnzivD9SB53cLV1MlHFNfOuPaadYSw==
+
 rtl-css-js@^1.14.0:
   version "1.15.0"
   resolved "https://registry.yarnpkg.com/rtl-css-js/-/rtl-css-js-1.15.0.tgz#680ed816e570a9ebccba9e1cd0f202c6a8bb2dc0"
@@ -7252,13 +6259,6 @@ run-script-os@^1.1.6:
   resolved "https://registry.yarnpkg.com/run-script-os/-/run-script-os-1.1.6.tgz#8b0177fb1b54c99a670f95c7fdc54f18b9c72347"
   integrity sha512-ql6P2LzhBTTDfzKts+Qo4H94VUKpxKDFz6QxxwaUZN0mwvi7L3lpOI7BqPCq7lgDh3XLl0dpeXwfcVIitlrYrw==
 
-rxjs@^7.0.0:
-  version "7.5.7"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.5.7.tgz#2ec0d57fdc89ece220d2e702730ae8f1e49def39"
-  integrity sha512-z9MzKh/UcOqB3i20H6rtrlaE/CgjLOvheWK/9ILrbhROGTweAi1BaFsTT9FbwZi5Trr1qNRs+MXkhmR06awzQA==
-  dependencies:
-    tslib "^2.1.0"
-
 safe-array-concat@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/safe-array-concat/-/safe-array-concat-1.0.0.tgz#2064223cba3c08d2ee05148eedbc563cd6d84060"
@@ -7332,10 +6332,10 @@ sax@^1.2.4:
   resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
   integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==
 
-saxes@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/saxes/-/saxes-5.0.1.tgz#eebab953fa3b7608dbe94e5dadb15c888fa6696d"
-  integrity sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw==
+saxes@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/saxes/-/saxes-6.0.0.tgz#fe5b4a4768df4f14a201b1ba6a65c1f3d9988cc5"
+  integrity sha512-xAg7SOnEhrm5zI3puOOKyy1OMcMlIJZYNJY7xLBwSze0UjhPLnWfj2GF2EpT0jmzaJKIWKHLsaSSajf35bcYnA==
   dependencies:
     xmlchars "^2.2.0"
 
@@ -7393,30 +6393,18 @@ semver@^5.5.0, semver@^5.6.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
   integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
 
-semver@^6.0.0, semver@^6.3.0:
-  version "6.3.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
-  integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
-
-semver@^6.2.0, semver@^6.3.1:
+semver@^6.0.0, semver@^6.2.0, semver@^6.3.0, semver@^6.3.1:
   version "6.3.1"
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
   integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
 
-semver@^7.3.2, semver@^7.5.4:
+semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7, semver@^7.3.8, semver@^7.5.4:
   version "7.5.4"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e"
   integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==
   dependencies:
     lru-cache "^6.0.0"
 
-semver@^7.3.4, semver@^7.3.5, semver@^7.3.7, semver@^7.3.8:
-  version "7.5.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.0.tgz#ed8c5dc8efb6c629c88b23d41dc9bf40c1d96cd0"
-  integrity sha512-+XC0AD/R7Q2mPSRuy2Id0+CGTZ98+8f+KvwirxOKIEyid+XSx6HbC63p+O4IndTHuX5Z+JxQ0TghCkO5Cg/2HA==
-  dependencies:
-    lru-cache "^6.0.0"
-
 serialize-error@^7.0.1:
   version "7.0.1"
   resolved "https://registry.yarnpkg.com/serialize-error/-/serialize-error-7.0.1.tgz#f1360b0447f61ffb483ec4157c737fab7d778e18"
@@ -7477,11 +6465,6 @@ shebang-regex@^3.0.0:
   resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172"
   integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==
 
-shell-quote@^1.7.3:
-  version "1.7.3"
-  resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.7.3.tgz#aa40edac170445b9a431e17bb62c0b881b9c4123"
-  integrity sha512-Vpfqwm4EnqGdlsBFNmHhxhElJYrdfcxPThu+ryKS5J8L/fhAwLazFZtq+S+TWZ9ANj2piSQLGj6NQg+lKPmxrw==
-
 side-channel@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf"
@@ -7496,13 +6479,6 @@ signal-exit@^3.0.2, signal-exit@^3.0.7:
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9"
   integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==
 
-simple-swizzle@^0.2.2:
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/simple-swizzle/-/simple-swizzle-0.2.2.tgz#a4da6b635ffcccca33f70d17cb92592de95e557a"
-  integrity sha1-pNprY1/8zMoz9w0Xy5JZLeleVXo=
-  dependencies:
-    is-arrayish "^0.3.1"
-
 sinon@9.0.2:
   version "9.0.2"
   resolved "https://registry.yarnpkg.com/sinon/-/sinon-9.0.2.tgz#b9017e24633f4b1c98dfb6e784a5f0509f5fd85d"
@@ -7540,7 +6516,7 @@ smart-buffer@^4.0.2, smart-buffer@^4.2.0:
   resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.2.0.tgz#6e1d71fa4f18c05f7d0ff216dd16a481d0e8d9ae"
   integrity sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==
 
-socks-proxy-agent@^6.1.0, socks-proxy-agent@^6.1.1:
+socks-proxy-agent@^6.1.0:
   version "6.2.0"
   resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-6.2.0.tgz#f6b5229cc0cbd6f2f202d9695f09d871e951c85e"
   integrity sha512-wWqJhjb32Q6GsrUqzuFkukxb/zzide5quXYcMVpIjxalDBBYy2nqKCFQ/9+Ie4dvOYSQdOk3hUlZSdzZOd3zMQ==
@@ -7587,7 +6563,7 @@ source-map@^0.5.6:
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
   integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=
 
-source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.1:
+source-map@^0.6.0, source-map@^0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
   integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
@@ -7597,40 +6573,11 @@ sourcemap-codec@^1.4.8:
   resolved "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz#ea804bd94857402e6992d05a38ef1ae35a9ab4c4"
   integrity sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==
 
-spawn-command@^0.0.2-1:
-  version "0.0.2-1"
-  resolved "https://registry.yarnpkg.com/spawn-command/-/spawn-command-0.0.2-1.tgz#62f5e9466981c1b796dc5929937e11c9c6921bd0"
-  integrity sha512-n98l9E2RMSJ9ON1AKisHzz7V42VDiBQGY6PB1BwRglz99wpVsSuGzQ+jOi6lFXBGVTCrRpltvjm+/XA+tpeJrg==
-
-spawn-wrap@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/spawn-wrap/-/spawn-wrap-2.0.0.tgz#103685b8b8f9b79771318827aa78650a610d457e"
-  integrity sha512-EeajNjfN9zMnULLwhZZQU3GWBoFNkbngTUPfaawT4RkMiviTxcX0qfhVbGey39mfctfDHkWtuecgQ8NJcyQWHg==
-  dependencies:
-    foreground-child "^2.0.0"
-    is-windows "^1.0.2"
-    make-dir "^3.0.0"
-    rimraf "^3.0.0"
-    signal-exit "^3.0.2"
-    which "^2.0.1"
-
 sprintf-js@^1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.2.tgz#da1765262bf8c0f571749f2ad6c26300207ae673"
   integrity sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug==
 
-sprintf-js@~1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
-  integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=
-
-ssri@^9.0.0:
-  version "9.0.1"
-  resolved "https://registry.yarnpkg.com/ssri/-/ssri-9.0.1.tgz#544d4c357a8d7b71a19700074b6883fcb4eae057"
-  integrity sha512-o57Wcn66jMQvfHG1FlYbWeZWW/dHZhJXjpIcTfXldXEk5nz5lStPo3mK0OJQfGR3RbZUlbISexbljkJzuEj/8Q==
-  dependencies:
-    minipass "^3.1.1"
-
 stack-generator@^2.0.5:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/stack-generator/-/stack-generator-2.0.5.tgz#fb00e5b4ee97de603e0773ea78ce944d81596c36"
@@ -7704,15 +6651,6 @@ string.prototype.trim@^1.2.7:
     define-properties "^1.1.4"
     es-abstract "^1.20.4"
 
-string.prototype.trimend@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz#914a65baaab25fbdd4ee291ca7dde57e869cb8d0"
-  integrity sha512-I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog==
-  dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.1.4"
-    es-abstract "^1.19.5"
-
 string.prototype.trimend@^1.0.6:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz#c4a27fa026d979d79c04f17397f250a462944533"
@@ -7722,15 +6660,6 @@ string.prototype.trimend@^1.0.6:
     define-properties "^1.1.4"
     es-abstract "^1.20.4"
 
-string.prototype.trimstart@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.5.tgz#5466d93ba58cfa2134839f81d7f42437e8c01fef"
-  integrity sha512-THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg==
-  dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.1.4"
-    es-abstract "^1.19.5"
-
 string.prototype.trimstart@^1.0.6:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz#e90ab66aa8e4007d92ef591bbf3cd422c56bdcf4"
@@ -7766,11 +6695,6 @@ strip-bom@^3.0.0:
   resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
   integrity sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=
 
-strip-bom@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-4.0.0.tgz#9c3505c1db45bcedca3d9cf7a16f5c5aa3901878"
-  integrity sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==
-
 strip-final-newline@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad"
@@ -7786,11 +6710,6 @@ strip-json-comments@~2.0.1:
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
   integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo=
 
-style-loader@^3.3.1:
-  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-3.3.1.tgz#057dfa6b3d4d7c7064462830f9113ed417d38575"
-  integrity sha512-GPcQ+LDJbrcxHORTRes6Jy2sfvK2kS6hpSfI/fXhPt+spVzxF6LJ1dHLN9zIGmVaaP044YKaIatFaufENRiDoQ==
-
 styled-components@5.1.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/styled-components/-/styled-components-5.1.1.tgz#96dfb02a8025794960863b9e8e365e3b6be5518d"
@@ -7827,7 +6746,7 @@ sumchecker@^3.0.1:
   dependencies:
     debug "^4.1.0"
 
-supports-color@8.1.1, supports-color@^8.0.0, supports-color@^8.1.0:
+supports-color@8.1.1, supports-color@^8.0.0:
   version "8.1.1"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-8.1.1.tgz#cd6fc17e28500cff56c1b86c0a7fd4a54a73005c"
   integrity sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==
@@ -7873,7 +6792,7 @@ tapable@^2.1.1, tapable@^2.2.0:
   resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.2.1.tgz#1967a73ef4060a82f12ab96af86d52fdb76eeca0"
   integrity sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==
 
-tar@^6.1.0, tar@^6.1.11, tar@^6.1.2:
+tar@^6.1.0, tar@^6.1.11:
   version "6.1.11"
   resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.11.tgz#6760a38f003afa1b2ffd0ffe9e9abbd0eab3d621"
   integrity sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA==
@@ -7914,15 +6833,6 @@ terser@^5.14.1, terser@^5.14.2:
     commander "^2.20.0"
     source-map-support "~0.5.20"
 
-test-exclude@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-6.0.0.tgz#04a8698661d805ea6fa293b6cb9e63ac044ef15e"
-  integrity sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==
-  dependencies:
-    "@istanbuljs/schema" "^0.1.2"
-    glob "^7.1.4"
-    minimatch "^3.0.4"
-
 text-table@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
@@ -7971,32 +6881,28 @@ toggle-selection@^1.0.6:
   resolved "https://registry.yarnpkg.com/toggle-selection/-/toggle-selection-1.0.6.tgz#6e45b1263f2017fa0acc7d89d78b15b8bf77da32"
   integrity sha1-bkWxJj8gF/oKzH2J14sVuL932jI=
 
-tough-cookie@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.0.0.tgz#d822234eeca882f991f0f908824ad2622ddbece4"
-  integrity sha512-tHdtEpQCMrc1YLrMaqXXcj6AxhYi/xgit6mZu1+EDWUn+qhUf8wMQoFIy9NXuq23zAwtcB0t/MjACGR18pcRbg==
+tough-cookie@^4.1.2:
+  version "4.1.3"
+  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.1.3.tgz#97b9adb0728b42280aa3d814b6b999b2ff0318bf"
+  integrity sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw==
   dependencies:
     psl "^1.1.33"
     punycode "^2.1.1"
-    universalify "^0.1.2"
+    universalify "^0.2.0"
+    url-parse "^1.5.3"
 
-tr46@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/tr46/-/tr46-3.0.0.tgz#555c4e297a950617e8eeddef633c87d4d9d6cbf9"
-  integrity sha512-l7FvfAHlcmulp8kr+flpQZmVwtu7nfRV7NZujtN0OqES8EL4O4e0qqzL0DC5gAvx/ZC/9lk6rhcUwYvkBnBnYA==
+tr46@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/tr46/-/tr46-4.1.1.tgz#281a758dcc82aeb4fe38c7dfe4d11a395aac8469"
+  integrity sha512-2lv/66T7e5yNyhAAC4NaKe5nVavzuGJQVVtRYLyQ2OI8tsJ61PMLlelehb0wi2Hx6+hT/OJUWZcw8MjlSRnxvw==
   dependencies:
-    punycode "^2.1.1"
+    punycode "^2.3.0"
 
 tr46@~0.0.3:
   version "0.0.3"
   resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a"
   integrity sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==
 
-tree-kill@^1.2.2:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/tree-kill/-/tree-kill-1.2.2.tgz#4ca09a9092c88b73a7cdc5e8a01b507b0790a0cc"
-  integrity sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==
-
 truncate-utf8-bytes@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/truncate-utf8-bytes/-/truncate-utf8-bytes-1.0.2.tgz#405923909592d56f78a5818434b0b78489ca5f2b"
@@ -8024,11 +6930,6 @@ ts-loader@^9.4.2:
     micromatch "^4.0.0"
     semver "^7.3.4"
 
-ts-mock-imports@^1.3.0:
-  version "1.3.8"
-  resolved "https://registry.yarnpkg.com/ts-mock-imports/-/ts-mock-imports-1.3.8.tgz#6b26887c651effe947ea91f928338d1899146fb9"
-  integrity sha512-A5n0iEg4zh2/qToo54XOa/wT31fAI0B8DHYU4RDcA6HIddZQPRkTsYri3Hl69+OSLjOKWjyP3/vYOIp3SAIZXg==
-
 tsconfig-paths@^3.14.1:
   version "3.14.1"
   resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz#ba0734599e8ea36c862798e920bcf163277b137a"
@@ -8051,13 +6952,6 @@ type-check@^0.4.0, type-check@~0.4.0:
   dependencies:
     prelude-ls "^1.2.1"
 
-type-check@~0.3.2:
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72"
-  integrity sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=
-  dependencies:
-    prelude-ls "~1.1.2"
-
 type-detect@4.0.8, type-detect@^4.0.0, type-detect@^4.0.5, type-detect@^4.0.8:
   version "4.0.8"
   resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz#7646fb5f18871cfbb7749e69bd39a6388eb7450c"
@@ -8073,11 +6967,6 @@ type-fest@^0.20.2:
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4"
   integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==
 
-type-fest@^0.8.0:
-  version "0.8.1"
-  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d"
-  integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==
-
 typed-array-buffer@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/typed-array-buffer/-/typed-array-buffer-1.0.0.tgz#18de3e7ed7974b0a729d3feecb94338d1472cd60"
@@ -8149,20 +7038,6 @@ underscore@>=1.8.3:
   resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.13.3.tgz#54bc95f7648c5557897e5e968d0f76bc062c34ee"
   integrity sha512-QvjkYpiD+dJJraRA8+dGAU4i7aBbb2s0S3jA45TFOvg2VgqvdCDd/3N6CqA8gluk1W91GLoXg5enMUx560QzuA==
 
-unique-filename@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-1.1.1.tgz#1d69769369ada0583103a1e6ae87681b56573230"
-  integrity sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==
-  dependencies:
-    unique-slug "^2.0.0"
-
-unique-slug@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-2.0.2.tgz#baabce91083fc64e945b0f3ad613e264f7cd4e6c"
-  integrity sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==
-  dependencies:
-    imurmurhash "^0.1.4"
-
 unique-string@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/unique-string/-/unique-string-2.0.0.tgz#39c6451f81afb2749de2b233e3f7c5e8843bd89d"
@@ -8170,11 +7045,16 @@ unique-string@^2.0.0:
   dependencies:
     crypto-random-string "^2.0.0"
 
-universalify@^0.1.0, universalify@^0.1.2:
+universalify@^0.1.0:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
   integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==
 
+universalify@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.2.0.tgz#6451760566fa857534745ab1dde952d1b1761be0"
+  integrity sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==
+
 universalify@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/universalify/-/universalify-1.0.0.tgz#b61a1da173e8435b2fe3c67d29b9adf8594bd16d"
@@ -8225,6 +7105,14 @@ url-join@^4.0.1:
   resolved "https://registry.yarnpkg.com/url-join/-/url-join-4.0.1.tgz#b642e21a2646808ffa178c4c5fda39844e12cde7"
   integrity sha512-jk1+QP6ZJqyOiuEI9AEWQfju/nB2Pw466kbA0LEZljHwKeMgd9WrAEgEGxjPDD2+TNbbb37rTyhEfrCXfuKXnA==
 
+url-parse@^1.5.3:
+  version "1.5.10"
+  resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.10.tgz#9d3c2f736c1d75dd3bd2be507dcc111f1e2ea9c1"
+  integrity sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==
+  dependencies:
+    querystringify "^2.1.1"
+    requires-port "^1.0.0"
+
 use-strict@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/use-strict/-/use-strict-1.0.1.tgz#0bb80d94f49a4a05192b84a8c7d34e95f1a7e3a0"
@@ -8245,7 +7133,7 @@ util-deprecate@^1.0.1, util-deprecate@^1.0.2:
   resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
   integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
 
-uuid@8.3.2, uuid@^8.3.2:
+uuid@8.3.2:
   version "8.3.2"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
   integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
@@ -8259,17 +7147,10 @@ verror@^1.10.0:
     core-util-is "1.0.2"
     extsprintf "^1.2.0"
 
-w3c-hr-time@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz#0a89cdf5cc15822df9c360543676963e0cc308cd"
-  integrity sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==
-  dependencies:
-    browser-process-hrtime "^1.0.0"
-
-w3c-xmlserializer@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/w3c-xmlserializer/-/w3c-xmlserializer-3.0.0.tgz#06cdc3eefb7e4d0b20a560a5a3aeb0d2d9a65923"
-  integrity sha512-3WFqGEgSXIyGhOmAFtlicJNMjEps8b1MG31NCA0/vOF9+nKMUW1ckhi9cnNHmf88Rzw5V+dwIwsm2C7X8k9aQg==
+w3c-xmlserializer@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/w3c-xmlserializer/-/w3c-xmlserializer-4.0.0.tgz#aebdc84920d806222936e3cdce408e32488a3073"
+  integrity sha512-d+BFHzbiCx6zGfz0HyQ6Rg69w9k19nviJspaj4yNscGjrHu94sVP+aRm75yEbCh+r2/yR+7q6hux9LVtbuTGBw==
   dependencies:
     xml-name-validator "^4.0.0"
 
@@ -8298,17 +7179,17 @@ webidl-conversions@^7.0.0:
   resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-7.0.0.tgz#256b4e1882be7debbf01d05f0aa2039778ea080a"
   integrity sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==
 
-webpack-cli@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-5.0.1.tgz#95fc0495ac4065e9423a722dec9175560b6f2d9a"
-  integrity sha512-S3KVAyfwUqr0Mo/ur3NzIp6jnerNpo7GUO6so51mxLi1spqsA17YcMXy0WOIJtBSnj748lthxC6XLbNKh/ZC+A==
+webpack-cli@^5.1.4:
+  version "5.1.4"
+  resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-5.1.4.tgz#c8e046ba7eaae4911d7e71e2b25b776fcc35759b"
+  integrity sha512-pIDJHIEI9LR0yxHXQ+Qh95k2EvXpWzZ5l+d+jIo+RdSm9MiHfzazIxwwni/p7+x4eJZuvG1AJwgC4TNQ7NRgsg==
   dependencies:
     "@discoveryjs/json-ext" "^0.5.0"
-    "@webpack-cli/configtest" "^2.0.1"
-    "@webpack-cli/info" "^2.0.1"
-    "@webpack-cli/serve" "^2.0.1"
+    "@webpack-cli/configtest" "^2.1.1"
+    "@webpack-cli/info" "^2.0.2"
+    "@webpack-cli/serve" "^2.0.5"
     colorette "^2.0.14"
-    commander "^9.4.1"
+    commander "^10.0.1"
     cross-spawn "^7.0.3"
     envinfo "^7.7.3"
     fastest-levenshtein "^1.0.12"
@@ -8318,9 +7199,9 @@ webpack-cli@^5.0.1:
     webpack-merge "^5.7.3"
 
 webpack-merge@^5.7.3:
-  version "5.8.0"
-  resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-5.8.0.tgz#2b39dbf22af87776ad744c390223731d30a68f61"
-  integrity sha512-/SaI7xY0831XwP6kzuwhKWVKDP9t1QY1h65lAFLbZqMPIuYcD9QAW4u9STIbU9kaJbPBB/geU/gLr1wDjOhQ+Q==
+  version "5.9.0"
+  resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-5.9.0.tgz#dc160a1c4cf512ceca515cc231669e9ddb133826"
+  integrity sha512-6NbRQw4+Sy50vYNTw7EyOn41OZItPiXB8GNv3INSoe3PSFaHJEz3SHTrYVaRm2LilNGnFUzh0FAwqPEmU/CwDg==
   dependencies:
     clone-deep "^4.0.1"
     wildcard "^2.0.0"
@@ -8372,20 +7253,12 @@ whatwg-mimetype@^3.0.0:
   resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-3.0.0.tgz#5fa1a7623867ff1af6ca3dc72ad6b8a4208beba7"
   integrity sha512-nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q==
 
-whatwg-url@^10.0.0:
-  version "10.0.0"
-  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-10.0.0.tgz#37264f720b575b4a311bd4094ed8c760caaa05da"
-  integrity sha512-CLxxCmdUby142H5FZzn4D8ikO1cmypvXVQktsgosNy4a4BHrDHeciBBGZhb0bNoR5/MltoCatso+vFjjGx8t0w==
-  dependencies:
-    tr46 "^3.0.0"
-    webidl-conversions "^7.0.0"
-
-whatwg-url@^11.0.0:
-  version "11.0.0"
-  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-11.0.0.tgz#0a849eebb5faf2119b901bb76fd795c2848d4018"
-  integrity sha512-RKT8HExMpoYx4igMiVMY83lN6UeITKJlBQ+vR/8ZJ8OCdSiN3RwCq+9gH0+Xzj0+5IrM6i4j/6LuvzbZIQgEcQ==
+whatwg-url@^12.0.0, whatwg-url@^12.0.1:
+  version "12.0.1"
+  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-12.0.1.tgz#fd7bcc71192e7c3a2a97b9a8d6b094853ed8773c"
+  integrity sha512-Ed/LrqB8EPlGxjS+TrsXcpUond1mhccS3pchLhzSgPCnTimUCKj3IZE75pAs5m6heB2U2TMerKFUXheyHY+VDQ==
   dependencies:
-    tr46 "^3.0.0"
+    tr46 "^4.1.1"
     webidl-conversions "^7.0.0"
 
 whatwg-url@^5.0.0:
@@ -8407,11 +7280,6 @@ which-boxed-primitive@^1.0.2:
     is-string "^1.0.5"
     is-symbol "^1.0.3"
 
-which-module@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
-  integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=
-
 which-typed-array@^1.1.10, which-typed-array@^1.1.11:
   version "1.1.11"
   resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.11.tgz#99d691f23c72aab6768680805a271b69761ed61a"
@@ -8452,29 +7320,15 @@ widest-line@^3.1.0:
     string-width "^4.0.0"
 
 wildcard@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/wildcard/-/wildcard-2.0.0.tgz#a77d20e5200c6faaac979e4b3aadc7b3dd7f8fec"
-  integrity sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw==
-
-word-wrap@~1.2.3:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
-  integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/wildcard/-/wildcard-2.0.1.tgz#5ab10d02487198954836b6349f74fff961e10f67"
+  integrity sha512-CC1bOL87PIWSBhDcTrdeLo6eGT7mCFtrg0uIJtqJUFyK+eJnzl8A1niH56uu7KMa5XFrtiV+AQuHO3n7DsHnLQ==
 
 workerpool@6.2.1:
   version "6.2.1"
   resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.2.1.tgz#46fc150c17d826b86a008e5a4508656777e9c343"
   integrity sha512-ILEIE97kDZvF9Wb9f6h5aXK4swSlKGUcOEGiIYb2OOu/IrDU9iwj0fD//SsA6E5ibwJxpEvhullJY4Sl4GcpAw==
 
-wrap-ansi@^6.2.0:
-  version "6.2.0"
-  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-6.2.0.tgz#e9393ba07102e6c91a3b221478f0257cd2856e53"
-  integrity sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==
-  dependencies:
-    ansi-styles "^4.0.0"
-    string-width "^4.1.0"
-    strip-ansi "^6.0.0"
-
 wrap-ansi@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
@@ -8504,10 +7358,10 @@ ws@^7.4.6:
   resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.7.tgz#9e0ac77ee50af70d58326ecff7e85eb3fa375e67"
   integrity sha512-KMvVuFzpKBuiIXW3E4u3mySRO2/mCHSyZDJQM5NQ9Q9KHWHWh0NHgfbRMLLrceUK5qAL4ytALJbpRMjixFZh8A==
 
-ws@^8.2.3:
-  version "8.6.0"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-8.6.0.tgz#e5e9f1d9e7ff88083d0c0dd8281ea662a42c9c23"
-  integrity sha512-AzmM3aH3gk0aX7/rZLYvjdvZooofDu3fFOzGqcSnQ1tOcTWwhM/o+q++E8mAyVVIyUdajrkzWUGftaVSDLn1bw==
+ws@^8.13.0:
+  version "8.13.0"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-8.13.0.tgz#9a9fb92f93cf41512a0735c8f4dd09b8a1211cd0"
+  integrity sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==
 
 xdg-basedir@^4.0.0:
   version "4.0.0"
@@ -8529,11 +7383,6 @@ xmlchars@^2.2.0:
   resolved "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.2.0.tgz#060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb"
   integrity sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==
 
-y18n@^4.0.0:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.3.tgz#b5f259c82cd6e336921efd7bfd8bf560de9eeedf"
-  integrity sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==
-
 y18n@^5.0.5:
   version "5.0.8"
   resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55"
@@ -8544,24 +7393,11 @@ yallist@^4.0.0:
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
   integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
 
-yaml@^1.10.0:
-  version "1.10.2"
-  resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b"
-  integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==
-
 yargs-parser@20.2.4:
   version "20.2.4"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.4.tgz#b42890f14566796f85ae8e3a25290d205f154a54"
   integrity sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==
 
-yargs-parser@^18.1.2:
-  version "18.1.3"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-18.1.3.tgz#be68c4975c6b2abf469236b0c870362fab09a7b0"
-  integrity sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==
-  dependencies:
-    camelcase "^5.0.0"
-    decamelize "^1.2.0"
-
 yargs-parser@^20.2.2:
   version "20.2.9"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee"
@@ -8595,24 +7431,7 @@ yargs@16.2.0:
     y18n "^5.0.5"
     yargs-parser "^20.2.2"
 
-yargs@^15.0.2:
-  version "15.4.1"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.4.1.tgz#0d87a16de01aee9d8bec2bfbf74f67851730f4f8"
-  integrity sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==
-  dependencies:
-    cliui "^6.0.0"
-    decamelize "^1.2.0"
-    find-up "^4.1.0"
-    get-caller-file "^2.0.1"
-    require-directory "^2.1.1"
-    require-main-filename "^2.0.0"
-    set-blocking "^2.0.0"
-    string-width "^4.2.0"
-    which-module "^2.0.0"
-    y18n "^4.0.0"
-    yargs-parser "^18.1.2"
-
-yargs@^17.0.1:
+yargs@^17.0.1, yargs@^17.6.0:
   version "17.7.2"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.7.2.tgz#991df39aca675a192b816e1e0363f9d75d2aa269"
   integrity sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==
@@ -8625,19 +7444,6 @@ yargs@^17.0.1:
     y18n "^5.0.5"
     yargs-parser "^21.1.1"
 
-yargs@^17.3.1, yargs@^17.6.0:
-  version "17.7.1"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.7.1.tgz#34a77645201d1a8fc5213ace787c220eabbd0967"
-  integrity sha512-cwiTb08Xuv5fqF4AovYacTFNxk62th7LKJ6BL9IGUpTJrWoU7/7WdQGTP2SjKf1dUNBGzDd28p/Yfs/GI6JrLw==
-  dependencies:
-    cliui "^8.0.1"
-    escalade "^3.1.1"
-    get-caller-file "^2.0.5"
-    require-directory "^2.1.1"
-    string-width "^4.2.3"
-    y18n "^5.0.5"
-    yargs-parser "^21.1.1"
-
 yauzl@^2.10.0:
   version "2.10.0"
   resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz#c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9"

From ab946e69b100c1f8e02cc8aeff30f0ee78d50ad9 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Wed, 2 Aug 2023 06:50:35 +0200
Subject: [PATCH 5/8] fix: finish updating dependencies

---
 package.json                                  |   20 +-
 patches/component-classes+1.2.6.patch         |   13 -
 ts/OS.ts                                      |    2 +-
 .../dialog/OnionStatusPathDialog.tsx          |    3 +-
 ts/components/dialog/SessionConfirm.tsx       |    2 +-
 ts/components/settings/SessionSettings.tsx    |    2 +-
 .../settings/ZoomingSessionSlider.tsx         |   14 +-
 ts/node/attachment_channel.ts                 |    2 +-
 ts/node/migration/signalMigrations.ts         |    2 +-
 ts/node/sql.ts                                |    2 +-
 ts/session/apis/seed_node_api/SeedNodeAPI.ts  |    4 +-
 ts/session/apis/snode_api/onions.ts           |    6 +-
 ts/session/apis/snode_api/sessionRpc.ts       |    2 +-
 .../crypto/DecryptedAttachmentsManager.ts     |    2 +-
 ts/shared/attachments/shared_attachments.ts   |    2 +-
 ts/test/automation/setup/beforeEach.ts        |    4 +-
 ts/test/automation/setup/open.ts              |    2 +-
 ts/test/automation/utilities/utils.ts         |    4 +-
 .../unit/crypto/MessageEncrypter_test.ts      |    2 +-
 .../session/unit/messages/ChatMessage_test.ts |    2 +-
 ts/test/session/unit/privacy/Privacy_test.ts  |    3 +-
 .../session/unit/sending/MessageQueue_test.ts |    3 +-
 .../unit/sending/MessageSender_test.ts        |    2 +-
 ts/test/session/unit/updater/updater_test.ts  |    2 +-
 ts/themes/globals.tsx                         |    1 +
 ts/updater/updater.ts                         |    2 +-
 ts/util/linkPreviewFetch.ts                   |    6 +-
 ts/util/linkPreviews.ts                       |    3 +-
 yarn.lock                                     | 2300 ++++++++---------
 29 files changed, 1164 insertions(+), 1250 deletions(-)
 delete mode 100644 patches/component-classes+1.2.6.patch

diff --git a/package.json b/package.json
index c259527bac..31c6c0d6e4 100644
--- a/package.json
+++ b/package.json
@@ -108,7 +108,7 @@
     "p-retry": "^4.2.0",
     "pify": "3.0.0",
     "protobufjs": "^6.11.2",
-    "rc-slider": "^8.7.1",
+    "rc-slider": "^10.2.1",
     "react": "^17.0.2",
     "react-contexify": "5.0.0",
     "react-dom": "^17.0.2",
@@ -119,8 +119,8 @@
     "react-qr-svg": "^2.2.1",
     "react-redux": "8.0.4",
     "react-toastify": "^6.0.9",
-    "react-use": "^17.2.1",
-    "react-virtualized": "9.22.3",
+    "react-use": "^17.4.0",
+    "react-virtualized": "^9.22.4",
     "read-last-lines-ts": "^1.2.1",
     "redux": "4.2.0",
     "redux-logger": "3.0.6",
@@ -130,7 +130,8 @@
     "sanitize.css": "^12.0.1",
     "semver": "5.4.1",
     "styled-components": "5.1.1",
-    "uuid": "8.3.2"
+    "uuid": "8.3.2",
+    "webrtc-adapter": "^4.1.1"
   },
   "devDependencies": {
     "@electron/notarize": "^2.1.0",
@@ -155,7 +156,6 @@
     "@types/mocha": "5.0.0",
     "@types/node-fetch": "^2.5.7",
     "@types/pify": "3.0.2",
-    "@types/rc-slider": "^8.6.5",
     "@types/react": "^17.0.2",
     "@types/react-dom": "^17.0.2",
     "@types/react-redux": "^7.1.24",
@@ -168,7 +168,6 @@
     "@types/uuid": "8.3.4",
     "@typescript-eslint/eslint-plugin": "^6.1.0",
     "@typescript-eslint/parser": "^6.1.0",
-    "asar": "3.1.0",
     "chai": "^4.3.4",
     "chai-as-promised": "^7.1.1",
     "chai-bytes": "^0.1.2",
@@ -339,9 +338,12 @@
       "!build/*.js",
       "build/afterPackHook.js",
       "build/launcher-script.sh",
-      "!node_modules/better-sqlite3/deps/*",
-      "!node_modules/better-sqlite3/src/*",
-      "node_modules/better-sqlite3/build/Release/better_sqlite3.node",
+      "!node_modules/@signalapp/better-sqlite3/deps/*",
+      "!node_modules/@signalapp/better-sqlite3/src/*",
+      "!node_modules/@signalapp/better-sqlite3/build/Release/obj/*",
+      "node_modules/@signalapp/better-sqlite3/build/Release/better_sqlite3.node",
+      "!node_modules/libsession_util_nodejs/libsession-util/*",
+      "!node_modules/libsession_util_nodejs/src/*",
       "ts/webworker/workers/node/libsession/*.node",
       "!dev-app-update.yml"
     ]
diff --git a/patches/component-classes+1.2.6.patch b/patches/component-classes+1.2.6.patch
deleted file mode 100644
index 23db4f91e0..0000000000
--- a/patches/component-classes+1.2.6.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/node_modules/component-classes/index.js b/node_modules/component-classes/index.js
-index eb9d292..752ebf2 100644
---- a/node_modules/component-classes/index.js
-+++ b/node_modules/component-classes/index.js
-@@ -3,7 +3,7 @@
-  */
-
- try {
--  var index = require('indexof');
-+  // var index = require('indexof');
- } catch (err) {
-   var index = require('component-indexof');
- }
diff --git a/ts/OS.ts b/ts/OS.ts
index 6ffa97f37e..4ae89178cb 100644
--- a/ts/OS.ts
+++ b/ts/OS.ts
@@ -1,5 +1,5 @@
-import _ from 'lodash';
 import os from 'os';
+import _ from 'lodash';
 import semver from 'semver';
 
 export const isMacOS = () => process.platform === 'darwin';
diff --git a/ts/components/dialog/OnionStatusPathDialog.tsx b/ts/components/dialog/OnionStatusPathDialog.tsx
index c966697b9f..5867235dab 100644
--- a/ts/components/dialog/OnionStatusPathDialog.tsx
+++ b/ts/components/dialog/OnionStatusPathDialog.tsx
@@ -1,6 +1,5 @@
-import React from 'react';
-
 import { shell } from 'electron';
+import React from 'react';
 
 import { useDispatch, useSelector } from 'react-redux';
 import useHover from 'react-use/lib/useHover';
diff --git a/ts/components/dialog/SessionConfirm.tsx b/ts/components/dialog/SessionConfirm.tsx
index c5987d81fd..18cec46c9f 100644
--- a/ts/components/dialog/SessionConfirm.tsx
+++ b/ts/components/dialog/SessionConfirm.tsx
@@ -1,5 +1,5 @@
-import { Dispatch } from '@reduxjs/toolkit';
 import { shell } from 'electron';
+import { Dispatch } from '@reduxjs/toolkit';
 import React, { useState } from 'react';
 import { MessageInteraction } from '../../interactions';
 import { updateConfirmModal } from '../../state/ducks/modalDialog';
diff --git a/ts/components/settings/SessionSettings.tsx b/ts/components/settings/SessionSettings.tsx
index e7dc6d2a56..b9226112fb 100644
--- a/ts/components/settings/SessionSettings.tsx
+++ b/ts/components/settings/SessionSettings.tsx
@@ -1,5 +1,5 @@
-import React from 'react';
 import { shell } from 'electron';
+import React from 'react';
 import autoBind from 'auto-bind';
 import styled from 'styled-components';
 
diff --git a/ts/components/settings/ZoomingSessionSlider.tsx b/ts/components/settings/ZoomingSessionSlider.tsx
index 11695e71c9..cab3ab269d 100644
--- a/ts/components/settings/ZoomingSessionSlider.tsx
+++ b/ts/components/settings/ZoomingSessionSlider.tsx
@@ -1,14 +1,17 @@
 import Slider from 'rc-slider';
 import React from 'react';
+import { isNumber } from 'lodash';
 
 import useUpdate from 'react-use/lib/useUpdate';
 import { SessionSettingsItemWrapper } from './SessionSettingListItem';
 
 export const ZoomingSessionSlider = (props: { onSliderChange?: (value: number) => void }) => {
   const forceUpdate = useUpdate();
-  const handleSlider = async (valueToForward: number) => {
-    props?.onSliderChange?.(valueToForward);
-    await window.setSettingValue('zoom-factor-setting', valueToForward);
+  const handleSlider = async (val: number | Array<number>) => {
+    const newSetting = isNumber(val) ? val : val?.[0] || 1;
+
+    props?.onSliderChange?.(newSetting);
+    await window.setSettingValue('zoom-factor-setting', newSetting);
     window.updateZoomFactor();
     forceUpdate();
   };
@@ -23,8 +26,9 @@ export const ZoomingSessionSlider = (props: { onSliderChange?: (value: number) =
           min={60}
           max={200}
           defaultValue={currentValueFromSettings}
-          // eslint-disable-next-line @typescript-eslint/no-misused-promises
-          onAfterChange={handleSlider}
+          onChange={e => {
+            void handleSlider(e);
+          }}
         />
 
         <div className="slider-info">
diff --git a/ts/node/attachment_channel.ts b/ts/node/attachment_channel.ts
index 17a20b411c..f53984dbb4 100644
--- a/ts/node/attachment_channel.ts
+++ b/ts/node/attachment_channel.ts
@@ -1,7 +1,7 @@
+import path from 'path';
 import { ipcMain } from 'electron';
 import { isString, map } from 'lodash';
 import rimraf from 'rimraf';
-import path from 'path';
 import fse from 'fs-extra';
 import pify from 'pify';
 // eslint-disable-next-line import/no-named-default
diff --git a/ts/node/migration/signalMigrations.ts b/ts/node/migration/signalMigrations.ts
index 6d7bddcd70..1dc919e466 100644
--- a/ts/node/migration/signalMigrations.ts
+++ b/ts/node/migration/signalMigrations.ts
@@ -1,6 +1,6 @@
+import path from 'path';
 import * as BetterSqlite3 from '@signalapp/better-sqlite3';
 import { isNumber } from 'lodash';
-import path from 'path';
 
 import {
   ATTACHMENT_DOWNLOADS_TABLE,
diff --git a/ts/node/sql.ts b/ts/node/sql.ts
index 493339044f..a8414c481a 100644
--- a/ts/node/sql.ts
+++ b/ts/node/sql.ts
@@ -1,7 +1,7 @@
-import * as BetterSqlite3 from '@signalapp/better-sqlite3';
 import { app, clipboard, dialog, Notification } from 'electron';
 import fs from 'fs';
 import path from 'path';
+import * as BetterSqlite3 from '@signalapp/better-sqlite3';
 import rimraf from 'rimraf';
 
 import {
diff --git a/ts/session/apis/seed_node_api/SeedNodeAPI.ts b/ts/session/apis/seed_node_api/SeedNodeAPI.ts
index bdf6c98483..3a31aedff2 100644
--- a/ts/session/apis/seed_node_api/SeedNodeAPI.ts
+++ b/ts/session/apis/seed_node_api/SeedNodeAPI.ts
@@ -1,8 +1,8 @@
+import tls from 'tls';
+import https from 'https';
 // eslint-disable-next-line import/no-named-default
 import { default as insecureNodeFetch } from 'node-fetch';
-import https from 'https';
 import _ from 'lodash';
-import tls from 'tls';
 import pRetry from 'p-retry';
 
 import { sha256 } from '../../crypto';
diff --git a/ts/session/apis/snode_api/onions.ts b/ts/session/apis/snode_api/onions.ts
index d29274a490..58e272c7aa 100644
--- a/ts/session/apis/snode_api/onions.ts
+++ b/ts/session/apis/snode_api/onions.ts
@@ -1,11 +1,13 @@
+import https from 'https';
 // eslint-disable-next-line import/no-named-default
 import { default as insecureNodeFetch, RequestInit, Response } from 'node-fetch';
-import https from 'https';
 import ByteBuffer from 'bytebuffer';
 import pRetry from 'p-retry';
 import { cloneDeep, isEmpty, isString, omit } from 'lodash';
 import { AbortSignal } from 'abort-controller';
 import { to_string } from 'libsodium-wrappers-sumo';
+// eslint-disable-next-line import/no-unresolved
+import { AbortSignal as AbortSignalNode } from 'node-fetch/externals';
 
 import { dropSnodeFromSnodePool, dropSnodeFromSwarmIfNeeded, updateSwarmFor } from './snodePool';
 
@@ -1068,7 +1070,7 @@ const sendOnionRequestNoRetries = async ({
   };
 
   if (abortSignal) {
-    guardFetchOptions.signal = abortSignal;
+    guardFetchOptions.signal = abortSignal as AbortSignalNode;
   }
 
   const guardUrl = `https://${guardNode.ip}:${guardNode.port}/onion_req/v2`;
diff --git a/ts/session/apis/snode_api/sessionRpc.ts b/ts/session/apis/snode_api/sessionRpc.ts
index f453402ec9..d4e9863942 100644
--- a/ts/session/apis/snode_api/sessionRpc.ts
+++ b/ts/session/apis/snode_api/sessionRpc.ts
@@ -1,6 +1,6 @@
+import https from 'https';
 // eslint-disable-next-line import/no-named-default
 import { default as insecureNodeFetch } from 'node-fetch';
-import https from 'https';
 import { clone } from 'lodash';
 import pRetry from 'p-retry';
 
diff --git a/ts/session/crypto/DecryptedAttachmentsManager.ts b/ts/session/crypto/DecryptedAttachmentsManager.ts
index 88e04b9dfa..57b0ad57fb 100644
--- a/ts/session/crypto/DecryptedAttachmentsManager.ts
+++ b/ts/session/crypto/DecryptedAttachmentsManager.ts
@@ -9,10 +9,10 @@
  *
  *
  */
+import path from 'path';
 import { reject } from 'lodash';
 
 import * as fse from 'fs-extra';
-import path from 'path';
 
 import { DURATION } from '../constants';
 import { makeObjectUrl, urlToBlob } from '../../types/attachments/VisualAttachment';
diff --git a/ts/shared/attachments/shared_attachments.ts b/ts/shared/attachments/shared_attachments.ts
index ff315d53e5..f4cfbef563 100644
--- a/ts/shared/attachments/shared_attachments.ts
+++ b/ts/shared/attachments/shared_attachments.ts
@@ -2,8 +2,8 @@
 //                       RelativePath ->
 //                       IO Unit
 
-import { isString } from 'lodash';
 import path from 'path';
+import { isString } from 'lodash';
 import fse from 'fs-extra';
 
 export const createDeleter = (root: string) => {
diff --git a/ts/test/automation/setup/beforeEach.ts b/ts/test/automation/setup/beforeEach.ts
index 7ba7bfdeee..826ede4975 100644
--- a/ts/test/automation/setup/beforeEach.ts
+++ b/ts/test/automation/setup/beforeEach.ts
@@ -1,7 +1,7 @@
-import { Page } from '@playwright/test';
-import { readdirSync, rmdirSync } from 'fs-extra';
 import { join } from 'path';
 import { homedir } from 'os';
+import { Page } from '@playwright/test';
+import { readdirSync, rmdirSync } from 'fs-extra';
 import { isLinux, isMacOS } from '../../../OS';
 import { MULTI_PREFIX, NODE_ENV } from './open';
 
diff --git a/ts/test/automation/setup/open.ts b/ts/test/automation/setup/open.ts
index 35529b6b4b..0db2f167bc 100644
--- a/ts/test/automation/setup/open.ts
+++ b/ts/test/automation/setup/open.ts
@@ -1,5 +1,5 @@
-import { _electron } from '@playwright/test';
 import { join } from 'path';
+import { _electron } from '@playwright/test';
 import { getAppRootPath } from '../../../node/getRootPath';
 
 export const NODE_ENV = 'production';
diff --git a/ts/test/automation/utilities/utils.ts b/ts/test/automation/utilities/utils.ts
index 94e8a10ead..9b0968fa9a 100644
--- a/ts/test/automation/utilities/utils.ts
+++ b/ts/test/automation/utilities/utils.ts
@@ -1,9 +1,7 @@
 /* eslint-disable no-useless-escape */
 /* eslint-disable import/no-extraneous-dependencies */
 /* eslint-disable no-await-in-loop */
-import { Page } from 'playwright-core';
-
-import { ElementHandle } from '@playwright/test';
+import { ElementHandle, Page } from '@playwright/test';
 import { sleepFor } from '../../../session/utils/Promise';
 import { loaderType, Strategy } from '../types/testing';
 
diff --git a/ts/test/session/unit/crypto/MessageEncrypter_test.ts b/ts/test/session/unit/crypto/MessageEncrypter_test.ts
index d2de24cfe1..27bc167c6e 100644
--- a/ts/test/session/unit/crypto/MessageEncrypter_test.ts
+++ b/ts/test/session/unit/crypto/MessageEncrypter_test.ts
@@ -1,5 +1,5 @@
-import chai, { expect } from 'chai';
 import * as crypto from 'crypto';
+import chai, { expect } from 'chai';
 import Sinon, * as sinon from 'sinon';
 import chaiBytes from 'chai-bytes';
 
diff --git a/ts/test/session/unit/messages/ChatMessage_test.ts b/ts/test/session/unit/messages/ChatMessage_test.ts
index 7fb84974b1..5bb8d32edd 100644
--- a/ts/test/session/unit/messages/ChatMessage_test.ts
+++ b/ts/test/session/unit/messages/ChatMessage_test.ts
@@ -1,6 +1,6 @@
+import { TextEncoder } from 'util';
 import { expect } from 'chai';
 
-import { TextEncoder } from 'util';
 import { toNumber } from 'lodash';
 import { SignalService } from '../../../../protobuf';
 import { Constants } from '../../../../session';
diff --git a/ts/test/session/unit/privacy/Privacy_test.ts b/ts/test/session/unit/privacy/Privacy_test.ts
index 843ff2a081..44a9b6eae8 100644
--- a/ts/test/session/unit/privacy/Privacy_test.ts
+++ b/ts/test/session/unit/privacy/Privacy_test.ts
@@ -1,8 +1,7 @@
+import path from 'path';
 import chai, { expect } from 'chai';
 import { describe } from 'mocha';
 
-import path from 'path';
-
 import chaiAsPromised from 'chai-as-promised';
 import { redactAll } from '../../../../util/privacy';
 
diff --git a/ts/test/session/unit/sending/MessageQueue_test.ts b/ts/test/session/unit/sending/MessageQueue_test.ts
index 70fa7816ca..63cb57cd37 100644
--- a/ts/test/session/unit/sending/MessageQueue_test.ts
+++ b/ts/test/session/unit/sending/MessageQueue_test.ts
@@ -6,10 +6,11 @@
 /* eslint-disable no-await-in-loop */
 /* eslint-disable no-unreachable-loop */
 /* eslint-disable no-restricted-syntax */
+import { randomBytes } from 'crypto';
+
 import chai from 'chai';
 import Sinon, * as sinon from 'sinon';
 import { describe } from 'mocha';
-import { randomBytes } from 'crypto';
 import chaiAsPromised from 'chai-as-promised';
 
 import { GroupUtils, PromiseUtils, UserUtils } from '../../../../session/utils';
diff --git a/ts/test/session/unit/sending/MessageSender_test.ts b/ts/test/session/unit/sending/MessageSender_test.ts
index 7cf526c65e..3fb0fcf70f 100644
--- a/ts/test/session/unit/sending/MessageSender_test.ts
+++ b/ts/test/session/unit/sending/MessageSender_test.ts
@@ -1,5 +1,5 @@
-import { expect } from 'chai';
 import * as crypto from 'crypto';
+import { expect } from 'chai';
 import _ from 'lodash';
 import Sinon, * as sinon from 'sinon';
 import { SignalService } from '../../../../protobuf';
diff --git a/ts/test/session/unit/updater/updater_test.ts b/ts/test/session/unit/updater/updater_test.ts
index 232c2106bc..c3af600232 100644
--- a/ts/test/session/unit/updater/updater_test.ts
+++ b/ts/test/session/unit/updater/updater_test.ts
@@ -1,6 +1,6 @@
+import path from 'path';
 import { readFileSync } from 'fs-extra';
 import { isEmpty } from 'lodash';
-import path from 'path';
 
 describe('Updater', () => {
   it.skip('isUpdateAvailable', () => {});
diff --git a/ts/themes/globals.tsx b/ts/themes/globals.tsx
index 795d116c43..dfe0f9387c 100644
--- a/ts/themes/globals.tsx
+++ b/ts/themes/globals.tsx
@@ -156,5 +156,6 @@ export function declareCSSVariables(variables: Record<string, string>) {
   for (const [key, value] of Object.entries(variables)) {
     output += `${key}: ${value};\n`;
   }
+
   return output;
 }
diff --git a/ts/updater/updater.ts b/ts/updater/updater.ts
index 785b4d9cd6..84f2c8cdf2 100644
--- a/ts/updater/updater.ts
+++ b/ts/updater/updater.ts
@@ -1,9 +1,9 @@
 /* eslint-disable @typescript-eslint/no-misused-promises */
 /* eslint-disable no-console */
+import * as path from 'path';
 import { app, BrowserWindow } from 'electron';
 import { autoUpdater, UpdateInfo } from 'electron-updater';
 import * as fs from 'fs-extra';
-import * as path from 'path';
 import { gt as isVersionGreaterThan, parse as parseVersion } from 'semver';
 
 import { windowMarkShouldQuit } from '../node/window_state';
diff --git a/ts/util/linkPreviewFetch.ts b/ts/util/linkPreviewFetch.ts
index 86d1fdc407..4c02b7241b 100644
--- a/ts/util/linkPreviewFetch.ts
+++ b/ts/util/linkPreviewFetch.ts
@@ -1,5 +1,7 @@
 import { RequestInit, Response } from 'node-fetch';
 import { AbortSignal } from 'abort-controller';
+// eslint-disable-next-line import/no-unresolved
+import { AbortSignal as AbortSignalNode } from 'node-fetch/externals';
 
 import { IMAGE_GIF, IMAGE_ICO, IMAGE_JPEG, IMAGE_PNG, IMAGE_WEBP, MIMEType } from '../types/MIME';
 
@@ -371,7 +373,7 @@ export async function fetchLinkPreviewMetadata(
         Accept: 'text/html,application/xhtml+xml',
         'User-Agent': 'WhatsApp',
       },
-      signal: abortSignal,
+      signal: abortSignal as AbortSignalNode,
     });
   } catch (err) {
     window?.log?.warn('fetchLinkPreviewMetadata: failed to fetch link preview HTML; bailing');
@@ -456,7 +458,7 @@ export async function fetchLinkPreviewImage(
         'User-Agent': 'WhatsApp',
       },
       size: MAX_IMAGE_CONTENT_LENGTH,
-      signal: abortSignal,
+      signal: abortSignal as AbortSignalNode,
     });
   } catch (err) {
     window?.log?.warn('fetchLinkPreviewImage: failed to fetch image; bailing');
diff --git a/ts/util/linkPreviews.ts b/ts/util/linkPreviews.ts
index ba78f0d6cf..21a8c5096c 100644
--- a/ts/util/linkPreviews.ts
+++ b/ts/util/linkPreviews.ts
@@ -1,7 +1,6 @@
 /* global URL */
-
-import { compact, isEmpty, isNumber, range } from 'lodash';
 import nodeUrl from 'url';
+import { compact, isEmpty, isNumber, range } from 'lodash';
 import LinkifyIt from 'linkify-it';
 
 const linkify = LinkifyIt();
diff --git a/yarn.lock b/yarn.lock
index 9718a312a2..116c6d2610 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -12,284 +12,288 @@
   resolved "https://registry.yarnpkg.com/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz#bd9154aec9983f77b3a034ecaa015c2e4201f6cf"
   integrity sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==
 
-"@ampproject/remapping@^2.1.0":
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.2.0.tgz#56c133824780de3174aed5ab6834f3026790154d"
-  integrity sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==
+"@ampproject/remapping@^2.2.0":
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.2.1.tgz#99e8e11851128b8702cd57c33684f1d0f260b630"
+  integrity sha512-lFMjJTrFL3j7L9yBxwYfCq2k6qqwHyzuUl/XBnif78PWTJYyL/dfowQHWE3sp6U6ZzqWiiIZnpTMO96zhkjwtg==
   dependencies:
-    "@jridgewell/gen-mapping" "^0.1.0"
+    "@jridgewell/gen-mapping" "^0.3.0"
     "@jridgewell/trace-mapping" "^0.3.9"
 
-"@babel/code-frame@^7.12.13", "@babel/code-frame@^7.14.5", "@babel/code-frame@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.18.6.tgz#3b25d38c89600baa2dcc219edfa88a74eb2c427a"
-  integrity sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==
+"@babel/code-frame@^7.12.13", "@babel/code-frame@^7.14.5", "@babel/code-frame@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.22.5.tgz#234d98e1551960604f1246e6475891a570ad5658"
+  integrity sha512-Xmwn266vad+6DAqEB2A6V/CcZVp62BbwVmcOJc2RPuwih1kw02TjQvWVWlcKGbBPd+8/0V5DEkOcizRGYsspYQ==
   dependencies:
-    "@babel/highlight" "^7.18.6"
+    "@babel/highlight" "^7.22.5"
 
-"@babel/compat-data@^7.18.8":
-  version "7.18.8"
-  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.18.8.tgz#2483f565faca607b8535590e84e7de323f27764d"
-  integrity sha512-HSmX4WZPPK3FUxYp7g2T6EyO8j96HlZJlxmKPSh6KAcqwyDrfx7hKjXpAW/0FhFfTJsR0Yt4lAjLI2coMptIHQ==
+"@babel/compat-data@^7.22.9":
+  version "7.22.9"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.22.9.tgz#71cdb00a1ce3a329ce4cbec3a44f9fef35669730"
+  integrity sha512-5UamI7xkUcJ3i9qVDS+KFDEK8/7oJ55/sJMB1Ge7IEapr7KfdfV/HErR+koZwOfd+SgtFKOKRhRakdg++DcJpQ==
 
 "@babel/core@^7.14.8":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.18.9.tgz#805461f967c77ff46c74ca0460ccf4fe933ddd59"
-  integrity sha512-1LIb1eL8APMy91/IMW+31ckrfBM4yCoLaVzoDhZUKSM4cu1L1nIidyxkCgzPAgrC5WEz36IPEr/eSeSF9pIn+g==
-  dependencies:
-    "@ampproject/remapping" "^2.1.0"
-    "@babel/code-frame" "^7.18.6"
-    "@babel/generator" "^7.18.9"
-    "@babel/helper-compilation-targets" "^7.18.9"
-    "@babel/helper-module-transforms" "^7.18.9"
-    "@babel/helpers" "^7.18.9"
-    "@babel/parser" "^7.18.9"
-    "@babel/template" "^7.18.6"
-    "@babel/traverse" "^7.18.9"
-    "@babel/types" "^7.18.9"
+  version "7.22.9"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.22.9.tgz#bd96492c68822198f33e8a256061da3cf391f58f"
+  integrity sha512-G2EgeufBcYw27U4hhoIwFcgc1XU7TlXJ3mv04oOv1WCuo900U/anZSPzEqNjwdjgffkk2Gs0AN0dW1CKVLcG7w==
+  dependencies:
+    "@ampproject/remapping" "^2.2.0"
+    "@babel/code-frame" "^7.22.5"
+    "@babel/generator" "^7.22.9"
+    "@babel/helper-compilation-targets" "^7.22.9"
+    "@babel/helper-module-transforms" "^7.22.9"
+    "@babel/helpers" "^7.22.6"
+    "@babel/parser" "^7.22.7"
+    "@babel/template" "^7.22.5"
+    "@babel/traverse" "^7.22.8"
+    "@babel/types" "^7.22.5"
     convert-source-map "^1.7.0"
     debug "^4.1.0"
     gensync "^1.0.0-beta.2"
-    json5 "^2.2.1"
-    semver "^6.3.0"
+    json5 "^2.2.2"
+    semver "^6.3.1"
 
-"@babel/generator@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.18.9.tgz#68337e9ea8044d6ddc690fb29acae39359cca0a5"
-  integrity sha512-wt5Naw6lJrL1/SGkipMiFxJjtyczUWTP38deiP1PO60HsBjDeKk08CGC3S8iVuvf0FmTdgKwU1KIXzSKL1G0Ug==
+"@babel/generator@^7.22.7", "@babel/generator@^7.22.9":
+  version "7.22.9"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.22.9.tgz#572ecfa7a31002fa1de2a9d91621fd895da8493d"
+  integrity sha512-KtLMbmicyuK2Ak/FTCJVbDnkN1SlT8/kceFTiuDiiRUUSMnHMidxSCdG4ndkTOHHpoomWe/4xkvHkEOncwjYIw==
   dependencies:
-    "@babel/types" "^7.18.9"
+    "@babel/types" "^7.22.5"
     "@jridgewell/gen-mapping" "^0.3.2"
+    "@jridgewell/trace-mapping" "^0.3.17"
     jsesc "^2.5.1"
 
-"@babel/helper-annotate-as-pure@^7.16.0", "@babel/helper-annotate-as-pure@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.16.7.tgz#bb2339a7534a9c128e3102024c60760a3a7f3862"
-  integrity sha512-s6t2w/IPQVTAET1HitoowRGXooX8mCgtuP5195wD/QJPV6wYjpujCGF7JuMODVX2ZAJOf1GT6DT9MHEZvLOFSw==
+"@babel/helper-annotate-as-pure@^7.18.6", "@babel/helper-annotate-as-pure@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.22.5.tgz#e7f06737b197d580a01edf75d97e2c8be99d3882"
+  integrity sha512-LvBTxu8bQSQkcyKOU+a1btnNFQ1dMAd0R6PyW3arXes06F6QLWLIrd681bxRPIXlrMGR3XYnW9JyML7dP3qgxg==
   dependencies:
-    "@babel/types" "^7.16.7"
+    "@babel/types" "^7.22.5"
 
-"@babel/helper-compilation-targets@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.18.9.tgz#69e64f57b524cde3e5ff6cc5a9f4a387ee5563bf"
-  integrity sha512-tzLCyVmqUiFlcFoAPLA/gL9TeYrF61VLNtb+hvkuVaB5SUjW7jcfrglBIX1vUIoT7CLP3bBlIMeyEsIl2eFQNg==
+"@babel/helper-compilation-targets@^7.22.9":
+  version "7.22.9"
+  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.9.tgz#f9d0a7aaaa7cd32a3f31c9316a69f5a9bcacb892"
+  integrity sha512-7qYrNM6HjpnPHJbopxmb8hSPoZ0gsX8IvUS32JGVoy+pU9e5N0nLr1VjJoR6kA4d9dmGLxNYOjeB8sUDal2WMw==
   dependencies:
-    "@babel/compat-data" "^7.18.8"
-    "@babel/helper-validator-option" "^7.18.6"
-    browserslist "^4.20.2"
-    semver "^6.3.0"
+    "@babel/compat-data" "^7.22.9"
+    "@babel/helper-validator-option" "^7.22.5"
+    browserslist "^4.21.9"
+    lru-cache "^5.1.1"
+    semver "^6.3.1"
+
+"@babel/helper-create-class-features-plugin@^7.18.6", "@babel/helper-create-class-features-plugin@^7.21.0", "@babel/helper-create-class-features-plugin@^7.22.9":
+  version "7.22.9"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.22.9.tgz#c36ea240bb3348f942f08b0fbe28d6d979fab236"
+  integrity sha512-Pwyi89uO4YrGKxL/eNJ8lfEH55DnRloGPOseaA8NFNL6jAUnn+KccaISiFazCj5IolPPDjGSdzQzXVzODVRqUQ==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.22.5"
+    "@babel/helper-environment-visitor" "^7.22.5"
+    "@babel/helper-function-name" "^7.22.5"
+    "@babel/helper-member-expression-to-functions" "^7.22.5"
+    "@babel/helper-optimise-call-expression" "^7.22.5"
+    "@babel/helper-replace-supers" "^7.22.9"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5"
+    "@babel/helper-split-export-declaration" "^7.22.6"
+    semver "^6.3.1"
+
+"@babel/helper-environment-visitor@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.5.tgz#f06dd41b7c1f44e1f8da6c4055b41ab3a09a7e98"
+  integrity sha512-XGmhECfVA/5sAt+H+xpSg0mfrHq6FzNr9Oxh7PSEBBRUb/mL7Kz3NICXb194rCqAEdxkhPT1a88teizAFyvk8Q==
 
-"@babel/helper-create-class-features-plugin@^7.17.12", "@babel/helper-create-class-features-plugin@^7.18.0":
-  version "7.18.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.18.0.tgz#fac430912606331cb075ea8d82f9a4c145a4da19"
-  integrity sha512-Kh8zTGR9de3J63e5nS0rQUdRs/kbtwoeQQ0sriS0lItjC96u8XXZN6lKpuyWd2coKSU13py/y+LTmThLuVX0Pg==
+"@babel/helper-function-name@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.22.5.tgz#ede300828905bb15e582c037162f99d5183af1be"
+  integrity sha512-wtHSq6jMRE3uF2otvfuD3DIvVhOsSNshQl0Qrd7qC9oQJzHvOL4qQXlQn2916+CXGywIjpGuIkoyZRRxHPiNQQ==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.16.7"
-    "@babel/helper-environment-visitor" "^7.16.7"
-    "@babel/helper-function-name" "^7.17.9"
-    "@babel/helper-member-expression-to-functions" "^7.17.7"
-    "@babel/helper-optimise-call-expression" "^7.16.7"
-    "@babel/helper-replace-supers" "^7.16.7"
-    "@babel/helper-split-export-declaration" "^7.16.7"
+    "@babel/template" "^7.22.5"
+    "@babel/types" "^7.22.5"
 
-"@babel/helper-environment-visitor@^7.16.7", "@babel/helper-environment-visitor@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz#0c0cee9b35d2ca190478756865bb3528422f51be"
-  integrity sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg==
+"@babel/helper-hoist-variables@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz#c01a007dac05c085914e8fb652b339db50d823bb"
+  integrity sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==
+  dependencies:
+    "@babel/types" "^7.22.5"
 
-"@babel/helper-function-name@^7.17.9", "@babel/helper-function-name@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.18.9.tgz#940e6084a55dee867d33b4e487da2676365e86b0"
-  integrity sha512-fJgWlZt7nxGksJS9a0XdSaI4XvpExnNIgRP+rVefWh5U7BL8pPuir6SJUmFKRfjWQ51OtWSzwOxhaH/EBWWc0A==
+"@babel/helper-member-expression-to-functions@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.22.5.tgz#0a7c56117cad3372fbf8d2fb4bf8f8d64a1e76b2"
+  integrity sha512-aBiH1NKMG0H2cGZqspNvsaBe6wNGjbJjuLy29aU+eDZjSbbN53BaxlpB02xm9v34pLTZ1nIQPFYn2qMZoa5BQQ==
   dependencies:
-    "@babel/template" "^7.18.6"
-    "@babel/types" "^7.18.9"
+    "@babel/types" "^7.22.5"
 
-"@babel/helper-hoist-variables@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz#d4d2c8fb4baeaa5c68b99cc8245c56554f926678"
-  integrity sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q==
+"@babel/helper-module-imports@^7.0.0", "@babel/helper-module-imports@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.22.5.tgz#1a8f4c9f4027d23f520bd76b364d44434a72660c"
+  integrity sha512-8Dl6+HD/cKifutF5qGd/8ZJi84QeAKh+CEe1sBzz8UayBBGg1dAIJrdHOcOM5b2MpzWL2yuotJTtGjETq0qjXg==
   dependencies:
-    "@babel/types" "^7.18.6"
+    "@babel/types" "^7.22.5"
 
-"@babel/helper-member-expression-to-functions@^7.16.7", "@babel/helper-member-expression-to-functions@^7.17.7":
-  version "7.17.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.17.7.tgz#a34013b57d8542a8c4ff8ba3f747c02452a4d8c4"
-  integrity sha512-thxXgnQ8qQ11W2wVUObIqDL4p148VMxkt5T/qpN5k2fboRyzFGFmKsTGViquyM5QHKUy48OZoca8kw4ajaDPyw==
+"@babel/helper-module-transforms@^7.22.5", "@babel/helper-module-transforms@^7.22.9":
+  version "7.22.9"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.22.9.tgz#92dfcb1fbbb2bc62529024f72d942a8c97142129"
+  integrity sha512-t+WA2Xn5K+rTeGtC8jCsdAH52bjggG5TKRuRrAGNM/mjIbO4GxvlLMFOEz9wXY5I2XQ60PMFsAG2WIcG82dQMQ==
   dependencies:
-    "@babel/types" "^7.17.0"
+    "@babel/helper-environment-visitor" "^7.22.5"
+    "@babel/helper-module-imports" "^7.22.5"
+    "@babel/helper-simple-access" "^7.22.5"
+    "@babel/helper-split-export-declaration" "^7.22.6"
+    "@babel/helper-validator-identifier" "^7.22.5"
 
-"@babel/helper-module-imports@^7.0.0", "@babel/helper-module-imports@^7.16.0", "@babel/helper-module-imports@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz#1e3ebdbbd08aad1437b428c50204db13c5a3ca6e"
-  integrity sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA==
+"@babel/helper-optimise-call-expression@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.22.5.tgz#f21531a9ccbff644fdd156b4077c16ff0c3f609e"
+  integrity sha512-HBwaojN0xFRx4yIvpwGqxiV2tUfl7401jlok564NgB9EHS1y6QT17FmKWm4ztqjeVdXLuC4fSvHc5ePpQjoTbw==
   dependencies:
-    "@babel/types" "^7.18.6"
+    "@babel/types" "^7.22.5"
 
-"@babel/helper-module-transforms@^7.18.0", "@babel/helper-module-transforms@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.18.9.tgz#5a1079c005135ed627442df31a42887e80fcb712"
-  integrity sha512-KYNqY0ICwfv19b31XzvmI/mfcylOzbLtowkw+mfvGPAQ3kfCnMLYbED3YecL5tPd8nAYFQFAd6JHp2LxZk/J1g==
-  dependencies:
-    "@babel/helper-environment-visitor" "^7.18.9"
-    "@babel/helper-module-imports" "^7.18.6"
-    "@babel/helper-simple-access" "^7.18.6"
-    "@babel/helper-split-export-declaration" "^7.18.6"
-    "@babel/helper-validator-identifier" "^7.18.6"
-    "@babel/template" "^7.18.6"
-    "@babel/traverse" "^7.18.9"
-    "@babel/types" "^7.18.9"
-
-"@babel/helper-optimise-call-expression@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.16.7.tgz#a34e3560605abbd31a18546bd2aad3e6d9a174f2"
-  integrity sha512-EtgBhg7rd/JcnpZFXpBy0ze1YRfdm7BnBX4uKMBd3ixa3RGAE002JZB66FJyNH7g0F38U05pXmA5P8cBh7z+1w==
-  dependencies:
-    "@babel/types" "^7.16.7"
-
-"@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.16.7", "@babel/helper-plugin-utils@^7.17.12", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
-  version "7.17.12"
-  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.17.12.tgz#86c2347da5acbf5583ba0a10aed4c9bf9da9cf96"
-  integrity sha512-JDkf04mqtN3y4iAbO1hv9U2ARpPyPL1zqyWs/2WG1pgSq9llHFjStX5jdxb84himgJm+8Ng+x0oiWF/nw/XQKA==
-
-"@babel/helper-replace-supers@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.16.7.tgz#e9f5f5f32ac90429c1a4bdec0f231ef0c2838ab1"
-  integrity sha512-y9vsWilTNaVnVh6xiJfABzsNpgDPKev9HnAgz6Gb1p6UUwf9NepdlsV7VXGCftJM+jqD5f7JIEubcpLjZj5dBw==
-  dependencies:
-    "@babel/helper-environment-visitor" "^7.16.7"
-    "@babel/helper-member-expression-to-functions" "^7.16.7"
-    "@babel/helper-optimise-call-expression" "^7.16.7"
-    "@babel/traverse" "^7.16.7"
-    "@babel/types" "^7.16.7"
-
-"@babel/helper-simple-access@^7.17.7", "@babel/helper-simple-access@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.18.6.tgz#d6d8f51f4ac2978068df934b569f08f29788c7ea"
-  integrity sha512-iNpIgTgyAvDQpDj76POqg+YEt8fPxx3yaNBg3S30dxNKm2SWfYhD0TGrK/Eu9wHpUW63VQU894TsTg+GLbUa1g==
+"@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.18.9", "@babel/helper-plugin-utils@^7.20.2", "@babel/helper-plugin-utils@^7.22.5", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.22.5.tgz#dd7ee3735e8a313b9f7b05a773d892e88e6d7295"
+  integrity sha512-uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg==
+
+"@babel/helper-replace-supers@^7.22.9":
+  version "7.22.9"
+  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.22.9.tgz#cbdc27d6d8d18cd22c81ae4293765a5d9afd0779"
+  integrity sha512-LJIKvvpgPOPUThdYqcX6IXRuIcTkcAub0IaDRGCZH0p5GPUp7PhRU9QVgFcDDd51BaPkk77ZjqFwh6DZTAEmGg==
   dependencies:
-    "@babel/types" "^7.18.6"
+    "@babel/helper-environment-visitor" "^7.22.5"
+    "@babel/helper-member-expression-to-functions" "^7.22.5"
+    "@babel/helper-optimise-call-expression" "^7.22.5"
 
-"@babel/helper-skip-transparent-expression-wrappers@^7.16.0":
-  version "7.16.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.16.0.tgz#0ee3388070147c3ae051e487eca3ebb0e2e8bb09"
-  integrity sha512-+il1gTy0oHwUsBQZyJvukbB4vPMdcYBrFHa0Uc4AizLxbq6BOYC51Rv4tWocX9BLBDLZ4kc6qUFpQ6HRgL+3zw==
+"@babel/helper-simple-access@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.22.5.tgz#4938357dc7d782b80ed6dbb03a0fba3d22b1d5de"
+  integrity sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w==
   dependencies:
-    "@babel/types" "^7.16.0"
+    "@babel/types" "^7.22.5"
 
-"@babel/helper-split-export-declaration@^7.16.7", "@babel/helper-split-export-declaration@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz#7367949bc75b20c6d5a5d4a97bba2824ae8ef075"
-  integrity sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA==
+"@babel/helper-skip-transparent-expression-wrappers@^7.20.0", "@babel/helper-skip-transparent-expression-wrappers@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.22.5.tgz#007f15240b5751c537c40e77abb4e89eeaaa8847"
+  integrity sha512-tK14r66JZKiC43p8Ki33yLBVJKlQDFoA8GYN67lWCDCqoL6EMMSuM9b+Iff2jHaM/RRFYl7K+iiru7hbRqNx8Q==
   dependencies:
-    "@babel/types" "^7.18.6"
+    "@babel/types" "^7.22.5"
 
-"@babel/helper-validator-identifier@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.18.6.tgz#9c97e30d31b2b8c72a1d08984f2ca9b574d7a076"
-  integrity sha512-MmetCkz9ej86nJQV+sFCxoGGrUbU3q02kgLciwkrt9QqEB7cP39oKEY0PakknEO0Gu20SskMRi+AYZ3b1TpN9g==
+"@babel/helper-split-export-declaration@^7.22.6":
+  version "7.22.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz#322c61b7310c0997fe4c323955667f18fcefb91c"
+  integrity sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==
+  dependencies:
+    "@babel/types" "^7.22.5"
 
-"@babel/helper-validator-option@^7.16.7", "@babel/helper-validator-option@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.18.6.tgz#bf0d2b5a509b1f336099e4ff36e1a63aa5db4db8"
-  integrity sha512-XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw==
+"@babel/helper-string-parser@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz#533f36457a25814cf1df6488523ad547d784a99f"
+  integrity sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==
 
-"@babel/helpers@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.18.9.tgz#4bef3b893f253a1eced04516824ede94dcfe7ff9"
-  integrity sha512-Jf5a+rbrLoR4eNdUmnFu8cN5eNJT6qdTdOg5IHIzq87WwyRw9PwguLFOWYgktN/60IP4fgDUawJvs7PjQIzELQ==
+"@babel/helper-validator-identifier@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.5.tgz#9544ef6a33999343c8740fa51350f30eeaaaf193"
+  integrity sha512-aJXu+6lErq8ltp+JhkJUfk1MTGyuA4v7f3pA+BJ5HLfNC6nAQ0Cpi9uOquUj8Hehg0aUiHzWQbOVJGao6ztBAQ==
+
+"@babel/helper-validator-option@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.22.5.tgz#de52000a15a177413c8234fa3a8af4ee8102d0ac"
+  integrity sha512-R3oB6xlIVKUnxNUxbmgq7pKjxpru24zlimpE8WK47fACIlM0II/Hm1RS8IaOI7NgCr6LNS+jl5l75m20npAziw==
+
+"@babel/helpers@^7.22.6":
+  version "7.22.6"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.22.6.tgz#8e61d3395a4f0c5a8060f309fb008200969b5ecd"
+  integrity sha512-YjDs6y/fVOYFV8hAf1rxd1QvR9wJe1pDBZ2AREKq/SDayfPzgk0PBnVuTCE5X1acEpMMNOVUqoe+OwiZGJ+OaA==
   dependencies:
-    "@babel/template" "^7.18.6"
-    "@babel/traverse" "^7.18.9"
-    "@babel/types" "^7.18.9"
+    "@babel/template" "^7.22.5"
+    "@babel/traverse" "^7.22.6"
+    "@babel/types" "^7.22.5"
 
-"@babel/highlight@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.18.6.tgz#81158601e93e2563795adcbfbdf5d64be3f2ecdf"
-  integrity sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==
+"@babel/highlight@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.22.5.tgz#aa6c05c5407a67ebce408162b7ede789b4d22031"
+  integrity sha512-BSKlD1hgnedS5XRnGOljZawtag7H1yPfQp0tdNJCHoH6AZ+Pcm9VvkrK59/Yy593Ypg0zMxH2BxD1VPYUQ7UIw==
   dependencies:
-    "@babel/helper-validator-identifier" "^7.18.6"
+    "@babel/helper-validator-identifier" "^7.22.5"
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
-"@babel/parser@^7.18.6", "@babel/parser@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.18.9.tgz#f2dde0c682ccc264a9a8595efd030a5cc8fd2539"
-  integrity sha512-9uJveS9eY9DJ0t64YbIBZICtJy8a5QrDEVdiLCG97fVLpDTpGX7t8mMSb6OWw6Lrnjqj4O8zwjELX3dhoMgiBg==
+"@babel/parser@^7.22.5", "@babel/parser@^7.22.7":
+  version "7.22.7"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.22.7.tgz#df8cf085ce92ddbdbf668a7f186ce848c9036cae"
+  integrity sha512-7NF8pOkHP5o2vpmGgNGcfAeCvOYhGLyA3Z4eBQkT1RJlWu47n63bCs93QfJ2hIAFCil7L5P2IWhs1oToVgrL0Q==
 
 "@babel/plugin-proposal-class-properties@^7.14.5":
-  version "7.17.12"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.17.12.tgz#84f65c0cc247d46f40a6da99aadd6438315d80a4"
-  integrity sha512-U0mI9q8pW5Q9EaTHFPwSVusPMV/DV9Mm8p7csqROFLtIE9rBF5piLqyrBGigftALrBcsBGu4m38JneAe7ZDLXw==
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.18.6.tgz#b110f59741895f7ec21a6fff696ec46265c446a3"
+  integrity sha512-cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.17.12"
-    "@babel/helper-plugin-utils" "^7.17.12"
+    "@babel/helper-create-class-features-plugin" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
 "@babel/plugin-proposal-dynamic-import@^7.14.5":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.16.7.tgz#c19c897eaa46b27634a00fee9fb7d829158704b2"
-  integrity sha512-I8SW9Ho3/8DRSdmDdH3gORdyUuYnk1m4cMxUAdu5oy4n3OfN8flDEH+d60iG7dUfi0KkYwSvoalHzzdRzpWHTg==
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.18.6.tgz#72bcf8d408799f547d759298c3c27c7e7faa4d94"
+  integrity sha512-1auuwmK+Rz13SJj36R+jqFPMJWyKEDd7lLSdOj4oJK0UTgGueSAtkrCvz9ewmgyU/P941Rv2fQwZJN8s6QruXw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.18.6"
     "@babel/plugin-syntax-dynamic-import" "^7.8.3"
 
 "@babel/plugin-proposal-export-namespace-from@^7.14.5":
-  version "7.17.12"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.17.12.tgz#b22864ccd662db9606edb2287ea5fd1709f05378"
-  integrity sha512-j7Ye5EWdwoXOpRmo5QmRyHPsDIe6+u70ZYZrd7uz+ebPYFKfRcLcNu3Ro0vOlJ5zuv8rU7xa+GttNiRzX56snQ==
+  version "7.18.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.18.9.tgz#5f7313ab348cdb19d590145f9247540e94761203"
+  integrity sha512-k1NtHyOMvlDDFeb9G5PhUXuGj8m/wiwojgQVEhJ/fsVsMCpLyOP4h0uGEjYJKrRI+EVPlb5Jk+Gt9P97lOGwtA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.17.12"
+    "@babel/helper-plugin-utils" "^7.18.9"
     "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
 
 "@babel/plugin-proposal-logical-assignment-operators@^7.14.5":
-  version "7.17.12"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.17.12.tgz#c64a1bcb2b0a6d0ed2ff674fd120f90ee4b88a23"
-  integrity sha512-EqFo2s1Z5yy+JeJu7SFfbIUtToJTVlC61/C7WLKDntSw4Sz6JNAIfL7zQ74VvirxpjB5kz/kIx0gCcb+5OEo2Q==
+  version "7.20.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.20.7.tgz#dfbcaa8f7b4d37b51e8bfb46d94a5aea2bb89d83"
+  integrity sha512-y7C7cZgpMIjWlKE5T7eJwp+tnRYM89HmRvWM5EQuB5BoHEONjmQ8lSNmBUwOyy/GFRsohJED51YBF79hE1djug==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.17.12"
+    "@babel/helper-plugin-utils" "^7.20.2"
     "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
 
 "@babel/plugin-proposal-nullish-coalescing-operator@^7.14.5":
-  version "7.17.12"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.17.12.tgz#1e93079bbc2cbc756f6db6a1925157c4a92b94be"
-  integrity sha512-ws/g3FSGVzv+VH86+QvgtuJL/kR67xaEIF2x0iPqdDfYW6ra6JF3lKVBkWynRLcNtIC1oCTfDRVxmm2mKzy+ag==
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.18.6.tgz#fdd940a99a740e577d6c753ab6fbb43fdb9467e1"
+  integrity sha512-wQxQzxYeJqHcfppzBDnm1yAY0jSRkUXR2z8RePZYrKwMKgMlE8+Z6LUno+bd6LvbGh8Gltvy74+9pIYkr+XkKA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.17.12"
+    "@babel/helper-plugin-utils" "^7.18.6"
     "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
 
 "@babel/plugin-proposal-numeric-separator@^7.14.5":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.16.7.tgz#d6b69f4af63fb38b6ca2558442a7fb191236eba9"
-  integrity sha512-vQgPMknOIgiuVqbokToyXbkY/OmmjAzr/0lhSIbG/KmnzXPGwW/AdhdKpi+O4X/VkWiWjnkKOBiqJrTaC98VKw==
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.18.6.tgz#899b14fbafe87f053d2c5ff05b36029c62e13c75"
+  integrity sha512-ozlZFogPqoLm8WBr5Z8UckIoE4YQ5KESVcNudyXOR8uqIkliTEgJ3RoketfG6pmzLdeZF0H/wjE9/cCEitBl7Q==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.18.6"
     "@babel/plugin-syntax-numeric-separator" "^7.10.4"
 
 "@babel/plugin-proposal-optional-chaining@^7.14.5":
-  version "7.17.12"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.17.12.tgz#f96949e9bacace3a9066323a5cf90cfb9de67174"
-  integrity sha512-7wigcOs/Z4YWlK7xxjkvaIw84vGhDv/P1dFGQap0nHkc8gFKY/r+hXc8Qzf5k1gY7CvGIcHqAnOagVKJJ1wVOQ==
+  version "7.21.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.21.0.tgz#886f5c8978deb7d30f678b2e24346b287234d3ea"
+  integrity sha512-p4zeefM72gpmEe2fkUr/OnOXpWEf8nAgk7ZYVqqfFiyIG7oFfVZcCrU64hWn5xp4tQ9LkV4bTIa5rD0KANpKNA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.17.12"
-    "@babel/helper-skip-transparent-expression-wrappers" "^7.16.0"
+    "@babel/helper-plugin-utils" "^7.20.2"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.20.0"
     "@babel/plugin-syntax-optional-chaining" "^7.8.3"
 
 "@babel/plugin-proposal-private-methods@^7.14.5":
-  version "7.17.12"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.17.12.tgz#c2ca3a80beb7539289938da005ad525a038a819c"
-  integrity sha512-SllXoxo19HmxhDWm3luPz+cPhtoTSKLJE9PXshsfrOzBqs60QP0r8OaJItrPhAj0d7mZMnNF0Y1UUggCDgMz1A==
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.18.6.tgz#5209de7d213457548a98436fa2882f52f4be6bea"
+  integrity sha512-nutsvktDItsNn4rpGItSNV2sz1XwS+nfU0Rg8aCx3W3NOKVzdMjJRu0O5OkgDp3ZGICSTbgRpxZoWsxoKRvbeA==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.17.12"
-    "@babel/helper-plugin-utils" "^7.17.12"
+    "@babel/helper-create-class-features-plugin" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
 "@babel/plugin-proposal-private-property-in-object@^7.14.5":
-  version "7.17.12"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.17.12.tgz#b02efb7f106d544667d91ae97405a9fd8c93952d"
-  integrity sha512-/6BtVi57CJfrtDNKfK5b66ydK2J5pXUKBKSPD2G1whamMuEnZWgoOIfO8Vf9F/DoD4izBLD/Au4NMQfruzzykg==
+  version "7.21.11"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.11.tgz#69d597086b6760c4126525cfa154f34631ff272c"
+  integrity sha512-0QZ8qP/3RLDVBwBFoWAwCtgcDZJVwA5LUJRZU8x2YFfKNuFq161wK3cuGrALu5yiPu+vzwTAg/sMWVNeWeNyaw==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.16.7"
-    "@babel/helper-create-class-features-plugin" "^7.17.12"
-    "@babel/helper-plugin-utils" "^7.17.12"
+    "@babel/helper-annotate-as-pure" "^7.18.6"
+    "@babel/helper-create-class-features-plugin" "^7.21.0"
+    "@babel/helper-plugin-utils" "^7.20.2"
     "@babel/plugin-syntax-private-property-in-object" "^7.14.5"
 
 "@babel/plugin-syntax-async-generators@^7.8.4":
@@ -320,6 +324,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
+"@babel/plugin-syntax-jsx@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.22.5.tgz#a6b68e84fb76e759fc3b93e901876ffabbe1d918"
+  integrity sha512-gvyP4hZrgrs/wWMaocvxZ44Hw0b3W8Pe+cMxc8V1ULQ07oh8VNbIRaoD1LRZVTvD+0nieDKjfgKg89sD7rrKrg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+
 "@babel/plugin-syntax-logical-assignment-operators@^7.10.4":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz#ca91ef46303530448b906652bac2e9fe9941f699"
@@ -369,40 +380,42 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-syntax-typescript@^7.17.12":
-  version "7.17.12"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.17.12.tgz#b54fc3be6de734a56b87508f99d6428b5b605a7b"
-  integrity sha512-TYY0SXFiO31YXtNg3HtFwNJHjLsAyIIhAhNWkQ5whPPS7HWUFlg9z0Ta4qAQNjQbP1wsSt/oKkmZ/4/WWdMUpw==
+"@babel/plugin-syntax-typescript@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.22.5.tgz#aac8d383b062c5072c647a31ef990c1d0af90272"
+  integrity sha512-1mS2o03i7t1c6VzH6fdQ3OA8tcEIxwG18zIPRp+UY1Ihv6W+XZzBCVxExF9upussPXJ0xE9XRHwMoNs1ep/nRQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.17.12"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-modules-commonjs@^7.14.5":
-  version "7.18.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.18.0.tgz#3be575e19fbd273d42adbc84566b1fad3582b3db"
-  integrity sha512-cCeR0VZWtfxWS4YueAK2qtHtBPJRSaJcMlbS8jhSIm/A3E2Kpro4W1Dn4cqJtp59dtWfXjQwK7SPKF8ghs7rlw==
+"@babel/plugin-transform-modules-commonjs@^7.14.5", "@babel/plugin-transform-modules-commonjs@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.22.5.tgz#7d9875908d19b8c0536085af7b053fd5bd651bfa"
+  integrity sha512-B4pzOXj+ONRmuaQTg05b3y/4DuFz3WcCNAXPLb2Q0GT0TrGKGxNKV4jwsXts+StaM0LQczZbOpj8o1DLPDJIiA==
   dependencies:
-    "@babel/helper-module-transforms" "^7.18.0"
-    "@babel/helper-plugin-utils" "^7.17.12"
-    "@babel/helper-simple-access" "^7.17.7"
-    babel-plugin-dynamic-import-node "^2.3.3"
+    "@babel/helper-module-transforms" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-simple-access" "^7.22.5"
 
-"@babel/plugin-transform-typescript@^7.17.12":
-  version "7.18.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.18.1.tgz#5fd8b86130bad95c4a24377b41ab989a9ccad22d"
-  integrity sha512-F+RJmL479HJmC0KeqqwEGZMg1P7kWArLGbAKfEi9yPthJyMNjF+DjxFF/halfQvq1Q9GFM4TUbYDNV8xe4Ctqg==
+"@babel/plugin-transform-typescript@^7.22.5":
+  version "7.22.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.22.9.tgz#91e08ad1eb1028ecc62662a842e93ecfbf3c7234"
+  integrity sha512-BnVR1CpKiuD0iobHPaM1iLvcwPYN2uVFAqoLVSpEDKWuOikoCv5HbKLxclhKYUXlWkX86DoZGtqI4XhbOsyrMg==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.18.0"
-    "@babel/helper-plugin-utils" "^7.17.12"
-    "@babel/plugin-syntax-typescript" "^7.17.12"
+    "@babel/helper-annotate-as-pure" "^7.22.5"
+    "@babel/helper-create-class-features-plugin" "^7.22.9"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/plugin-syntax-typescript" "^7.22.5"
 
 "@babel/preset-typescript@^7.14.5":
-  version "7.17.12"
-  resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.17.12.tgz#40269e0a0084d56fc5731b6c40febe1c9a4a3e8c"
-  integrity sha512-S1ViF8W2QwAKUGJXxP9NAfNaqGDdEBJKpYkxHf5Yy2C4NPPzXGeR3Lhk7G8xJaaLcFTRfNjVbtbVtm8Gb0mqvg==
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.22.5.tgz#16367d8b01d640e9a507577ed4ee54e0101e51c8"
+  integrity sha512-YbPaal9LxztSGhmndR46FmAbkJ/1fAsw293tSU+I5E5h+cnJ3d4GTwyUgGYmOXJYdGA+uNePle4qbaRzj2NISQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.17.12"
-    "@babel/helper-validator-option" "^7.16.7"
-    "@babel/plugin-transform-typescript" "^7.17.12"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-validator-option" "^7.22.5"
+    "@babel/plugin-syntax-jsx" "^7.22.5"
+    "@babel/plugin-transform-modules-commonjs" "^7.22.5"
+    "@babel/plugin-transform-typescript" "^7.22.5"
 
 "@babel/runtime@7.4.5":
   version "7.4.5"
@@ -411,44 +424,45 @@
   dependencies:
     regenerator-runtime "^0.13.2"
 
-"@babel/runtime@^7.1.2", "@babel/runtime@^7.10.2", "@babel/runtime@^7.12.1", "@babel/runtime@^7.3.4", "@babel/runtime@^7.5.5", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.22.5.tgz#8564dd588182ce0047d55d7a75e93921107b57ec"
-  integrity sha512-ecjvYlnAaZ/KVneE/OdKYBYfgXV3Ptu6zQWmgEF7vwKhQnvVS6bjMD2XYgj+SNvQ1GfK/pjgokfPkC/2CO8CuA==
+"@babel/runtime@^7.1.2", "@babel/runtime@^7.10.1", "@babel/runtime@^7.10.2", "@babel/runtime@^7.12.1", "@babel/runtime@^7.18.3", "@babel/runtime@^7.3.4", "@babel/runtime@^7.5.5", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2":
+  version "7.22.6"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.22.6.tgz#57d64b9ae3cff1d67eb067ae117dac087f5bd438"
+  integrity sha512-wDb5pWm4WDdF6LFUde3Jl8WzPA+3ZbxYqkC6xAXuD3irdEHN1k0NfTRrJD8ZD378SJ61miMLCqIOXYhd8x+AJQ==
   dependencies:
     regenerator-runtime "^0.13.11"
 
-"@babel/template@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.18.6.tgz#1283f4993e00b929d6e2d3c72fdc9168a2977a31"
-  integrity sha512-JoDWzPe+wgBsTTgdnIma3iHNFC7YVJoPssVBDjiHfNlyt4YcunDtcDOUmfVDfCK5MfdsaIoX9PkijPhjH3nYUw==
-  dependencies:
-    "@babel/code-frame" "^7.18.6"
-    "@babel/parser" "^7.18.6"
-    "@babel/types" "^7.18.6"
-
-"@babel/traverse@^7.16.7", "@babel/traverse@^7.18.9", "@babel/traverse@^7.4.5":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.18.9.tgz#deeff3e8f1bad9786874cb2feda7a2d77a904f98"
-  integrity sha512-LcPAnujXGwBgv3/WHv01pHtb2tihcyW1XuL9wd7jqh1Z8AQkTd+QVjMrMijrln0T7ED3UXLIy36P9Ao7W75rYg==
-  dependencies:
-    "@babel/code-frame" "^7.18.6"
-    "@babel/generator" "^7.18.9"
-    "@babel/helper-environment-visitor" "^7.18.9"
-    "@babel/helper-function-name" "^7.18.9"
-    "@babel/helper-hoist-variables" "^7.18.6"
-    "@babel/helper-split-export-declaration" "^7.18.6"
-    "@babel/parser" "^7.18.9"
-    "@babel/types" "^7.18.9"
+"@babel/template@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.22.5.tgz#0c8c4d944509875849bd0344ff0050756eefc6ec"
+  integrity sha512-X7yV7eiwAxdj9k94NEylvbVHLiVG1nvzCV2EAowhxLTwODV1jl9UzZ48leOC0sH7OnuHrIkllaBgneUykIcZaw==
+  dependencies:
+    "@babel/code-frame" "^7.22.5"
+    "@babel/parser" "^7.22.5"
+    "@babel/types" "^7.22.5"
+
+"@babel/traverse@^7.22.6", "@babel/traverse@^7.22.8", "@babel/traverse@^7.4.5":
+  version "7.22.8"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.22.8.tgz#4d4451d31bc34efeae01eac222b514a77aa4000e"
+  integrity sha512-y6LPR+wpM2I3qJrsheCTwhIinzkETbplIgPBbwvqPKc+uljeA5gP+3nP8irdYt1mjQaDnlIcG+dw8OjAco4GXw==
+  dependencies:
+    "@babel/code-frame" "^7.22.5"
+    "@babel/generator" "^7.22.7"
+    "@babel/helper-environment-visitor" "^7.22.5"
+    "@babel/helper-function-name" "^7.22.5"
+    "@babel/helper-hoist-variables" "^7.22.5"
+    "@babel/helper-split-export-declaration" "^7.22.6"
+    "@babel/parser" "^7.22.7"
+    "@babel/types" "^7.22.5"
     debug "^4.1.0"
     globals "^11.1.0"
 
-"@babel/types@^7.16.0", "@babel/types@^7.16.7", "@babel/types@^7.17.0", "@babel/types@^7.18.6", "@babel/types@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.18.9.tgz#7148d64ba133d8d73a41b3172ac4b83a1452205f"
-  integrity sha512-WwMLAg2MvJmt/rKEVQBBhIVffMmnilX4oe0sRe7iPOHIGsqpruFHHdrfj4O1CMMtgMtCU4oPafZjDPCRgO57Wg==
+"@babel/types@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.22.5.tgz#cd93eeaab025880a3a47ec881f4b096a5b786fbe"
+  integrity sha512-zo3MIHGOkPOfoRXitsgHLjEXmlDaD/5KU1Uzuc9GNiZPhSqVxVRtxuPaSBZDsYZ9qV88AjtMtWW7ww98loJ9KA==
   dependencies:
-    "@babel/helper-validator-identifier" "^7.18.6"
+    "@babel/helper-string-parser" "^7.22.5"
+    "@babel/helper-validator-identifier" "^7.22.5"
     to-fast-properties "^2.0.0"
 
 "@develar/schema-utils@~2.6.5":
@@ -540,15 +554,15 @@
   dependencies:
     eslint-visitor-keys "^3.3.0"
 
-"@eslint-community/regexpp@^4.4.0", "@eslint-community/regexpp@^4.5.1":
-  version "4.5.1"
-  resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.5.1.tgz#cdd35dce4fa1a89a4fd42b1599eb35b3af408884"
-  integrity sha512-Z5ba73P98O1KUYCCJTUeVpja9RcGoMdncZ6T49FCUl2lN38JtCJ+3WgIDBv0AuY4WChU5PmtJmOCTlN6FZTFKQ==
+"@eslint-community/regexpp@^4.5.1", "@eslint-community/regexpp@^4.6.1":
+  version "4.6.2"
+  resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.6.2.tgz#1816b5f6948029c5eaacb0703b850ee0cb37d8f8"
+  integrity sha512-pPTNuaAG3QMH+buKyBIGJs3g/S5y0caxw0ygM3YyE6yJFySwiGGSzA+mM3KJ8QQvzeLh3blwgSonkFjgQdxzMw==
 
-"@eslint/eslintrc@^2.1.0":
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-2.1.0.tgz#82256f164cc9e0b59669efc19d57f8092706841d"
-  integrity sha512-Lj7DECXqIVCqnqjjHMPna4vn6GJcMgul/wuS0je9OZ9gsL0zzDpKPVtcG1HaDVc+9y+qgXneTeUMbCqXJNpH1A==
+"@eslint/eslintrc@^2.1.1":
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-2.1.1.tgz#18d635e24ad35f7276e8a49d135c7d3ca6a46f93"
+  integrity sha512-9t7ZA7NGGK8ckelF0PQCfcxIUzs1Md5rrO6U/c+FIQNanea5UZC0wqKXH4vHBccmu4ZJgZ2idtPeW7+Q2npOEA==
   dependencies:
     ajv "^6.12.4"
     debug "^4.3.2"
@@ -560,10 +574,10 @@
     minimatch "^3.1.2"
     strip-json-comments "^3.1.1"
 
-"@eslint/js@8.44.0":
-  version "8.44.0"
-  resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.44.0.tgz#961a5903c74139390478bdc808bcde3fc45ab7af"
-  integrity sha512-Ag+9YM4ocKQx9AarydN0KY2j0ErMHNIocPDrVo8zAE44xLTjEtz81OdR68/cydGtk6m6jDb5Za3r2useMzYmSw==
+"@eslint/js@^8.46.0":
+  version "8.46.0"
+  resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.46.0.tgz#3f7802972e8b6fe3f88ed1aabc74ec596c456db6"
+  integrity sha512-a8TLtmPi8xzPkCbp/OGFUo5yhRkHM2Ko9kOWP4znJr0WAhWyThaw3PnwX4vOTWOAMsV2uRt32PPDcEz63esSaA==
 
 "@humanwhocodes/config-array@^0.11.10":
   version "0.11.10"
@@ -590,9 +604,9 @@
   integrity sha512-6AZfvWru20Rl9pXULStkVvTWnua6VG56zOIKdkCzLh25XVeTDEp6f1dL7iX9w+way5+1hI0BBuqTQd61qYaKdg==
 
 "@iconify/react@^3.1.3":
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/@iconify/react/-/react-3.2.1.tgz#d18da31cec58c1aa8fdf4def451cc7e3196d88de"
-  integrity sha512-yKzixjC9ct9RC/aSGo1OGxkG2rpfhlr/urRz6k2YZlIBzn92PBTlqtSx8o8dFYEorr3eUFSCBZFzBy1yw5jsAA==
+  version "3.2.2"
+  resolved "https://registry.yarnpkg.com/@iconify/react/-/react-3.2.2.tgz#ab5241dc01562076bae3b0c22238aff7e5f029cc"
+  integrity sha512-z3+Jno3VcJzgNHsN5mEvYMsgCkOZkydqdIwOxjXh45+i2Vs9RGH68Y52vt39izwFSfuYUXhaW+1u7m7+IhCn/g==
 
 "@jest/types@^27.2.5", "@jest/types@^27.5.1":
   version "27.5.1"
@@ -605,18 +619,10 @@
     "@types/yargs" "^16.0.0"
     chalk "^4.0.0"
 
-"@jridgewell/gen-mapping@^0.1.0":
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz#e5d2e450306a9491e3bd77e323e38d7aff315996"
-  integrity sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w==
-  dependencies:
-    "@jridgewell/set-array" "^1.0.0"
-    "@jridgewell/sourcemap-codec" "^1.4.10"
-
 "@jridgewell/gen-mapping@^0.3.0", "@jridgewell/gen-mapping@^0.3.2":
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz#c1aedc61e853f2bb9f5dfe6d4442d3b565b253b9"
-  integrity sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==
+  version "0.3.3"
+  resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz#7e02e6eb5df901aaedb08514203b096614024098"
+  integrity sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==
   dependencies:
     "@jridgewell/set-array" "^1.0.1"
     "@jridgewell/sourcemap-codec" "^1.4.10"
@@ -627,28 +633,33 @@
   resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz#2203b118c157721addfe69d47b70465463066d78"
   integrity sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==
 
-"@jridgewell/set-array@^1.0.0", "@jridgewell/set-array@^1.0.1":
+"@jridgewell/set-array@^1.0.1":
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.1.2.tgz#7c6cf998d6d20b914c0a55a91ae928ff25965e72"
   integrity sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==
 
-"@jridgewell/source-map@^0.3.2":
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/@jridgewell/source-map/-/source-map-0.3.2.tgz#f45351aaed4527a298512ec72f81040c998580fb"
-  integrity sha512-m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw==
+"@jridgewell/source-map@^0.3.3":
+  version "0.3.5"
+  resolved "https://registry.yarnpkg.com/@jridgewell/source-map/-/source-map-0.3.5.tgz#a3bb4d5c6825aab0d281268f47f6ad5853431e91"
+  integrity sha512-UTYAUj/wviwdsMfzoSJspJxbkH5o1snzwX0//0ENX1u/55kkZZkcTZP6u9bwKGkv+dkk9at4m1Cpt0uY80kcpQ==
   dependencies:
     "@jridgewell/gen-mapping" "^0.3.0"
     "@jridgewell/trace-mapping" "^0.3.9"
 
-"@jridgewell/sourcemap-codec@1.4.14", "@jridgewell/sourcemap-codec@^1.4.10":
+"@jridgewell/sourcemap-codec@1.4.14":
   version "1.4.14"
   resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz#add4c98d341472a289190b424efbdb096991bb24"
   integrity sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==
 
-"@jridgewell/trace-mapping@^0.3.14", "@jridgewell/trace-mapping@^0.3.9":
-  version "0.3.17"
-  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.17.tgz#793041277af9073b0951a7fe0f0d8c4c98c36985"
-  integrity sha512-MCNzAp77qzKca9+W/+I0+sEpaUnZoeasnghNeVc41VZCEKaCH73Vq3BZZ/SzWIgrqE4H4ceI+p+b6C0mHf9T4g==
+"@jridgewell/sourcemap-codec@^1.4.10":
+  version "1.4.15"
+  resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz#d7c6e6755c78567a951e04ab52ef0fd26de59f32"
+  integrity sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==
+
+"@jridgewell/trace-mapping@^0.3.17", "@jridgewell/trace-mapping@^0.3.9":
+  version "0.3.18"
+  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.18.tgz#25783b2086daf6ff1dcb53c9249ae480e4dd4cd6"
+  integrity sha512-w+niJYzMHdd7USdiH2U6869nqhD2nbfZXND5Yp93qIbEmnDNk7PD48o+YchRVpzMU7M6jVCbenTR7PA1FLQ9pA==
   dependencies:
     "@jridgewell/resolve-uri" "3.1.0"
     "@jridgewell/sourcemap-codec" "1.4.14"
@@ -807,9 +818,9 @@
   integrity sha512-t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw==
 
 "@sinonjs/commons@^1", "@sinonjs/commons@^1.6.0", "@sinonjs/commons@^1.7.0", "@sinonjs/commons@^1.7.2":
-  version "1.8.3"
-  resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.3.tgz#3802ddd21a50a949b6721ddd72da36e67e7f1b2d"
-  integrity sha512-xkNcLAn/wZaX14RPlwizcKicDk9G3F8m2nU3L7Ukm5zBgTwiT0wsoFAHx9Jq56fJA1z/7uKGtCRu16sOUCLIHQ==
+  version "1.8.6"
+  resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.6.tgz#80c516a4dc264c2a69115e7578d62581ff455ed9"
+  integrity sha512-Ky+XkAkqPZSm3NLBeUng77EBQl3cmeJhITaGHdYH8kjVB+aun3S4XBRti2zt17mtt0mIUDiNxYeoJm6drVvBJQ==
   dependencies:
     type-detect "4.0.8"
 
@@ -838,9 +849,9 @@
     type-detect "^4.0.8"
 
 "@sinonjs/text-encoding@^0.7.1":
-  version "0.7.1"
-  resolved "https://registry.yarnpkg.com/@sinonjs/text-encoding/-/text-encoding-0.7.1.tgz#8da5c6530915653f3a1f38fd5f101d8c3f8079c5"
-  integrity sha512-+iTbntw2IZPb/anVDbypzfQa+ay64MW0Zo8aJ8gZPWMMK6/OubMVb6lUPMagqjOPnmtauXnFCACVl3O7ogjeqQ==
+  version "0.7.2"
+  resolved "https://registry.yarnpkg.com/@sinonjs/text-encoding/-/text-encoding-0.7.2.tgz#5981a8db18b56ba38ef0efb7d995b12aa7b51918"
+  integrity sha512-sXXKG+uL9IrKqViTtao2Ws6dy0znu9sOaP1di/jKGW1M6VssO8vlpXCQcpZ+jisQ1tTFAC5Jo/EOzFbggBagFQ==
 
 "@szmarczak/http-timer@^4.0.5":
   version "4.0.6"
@@ -868,9 +879,9 @@
   integrity sha512-IoT8BXBuuWWscQnscGtAYH4dGEOr3uQ85MJdE9LAfperio8FQwyFaigHITPJSy+NSS4w9UHKhzmtQXt5A+544g==
 
 "@types/buffer-crc32@^0.2.0":
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/@types/buffer-crc32/-/buffer-crc32-0.2.0.tgz#a4d94b1a4f01ea414268e9ef7576c7d32a1a14e4"
-  integrity sha512-6lBhJ55o2DKVCxTanyS6ohWRyebCcyivIK7pRHiwZuOYbUhivcByYBrvm2dc9f72LZP12mH5mGxUhG7JQ64lQg==
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/@types/buffer-crc32/-/buffer-crc32-0.2.2.tgz#e115de47913ce34cc2662be43d708d8bef874ab7"
+  integrity sha512-UpJyUKgG33LVehYtv9k2x4HUEY5ThV62YNGFBbQNBgtoky/0tQCceh8BPI9r3XL5hQ1tGmq34jGWNRBKf2P1UQ==
   dependencies:
     "@types/node" "*"
 
@@ -882,22 +893,22 @@
     "@types/node" "*"
 
 "@types/bytebuffer@^5.0.41":
-  version "5.0.43"
-  resolved "https://registry.yarnpkg.com/@types/bytebuffer/-/bytebuffer-5.0.43.tgz#b5259fca1412106bcee0cabfbf7c104846d06738"
-  integrity sha512-vQnTYvy4LpSojHjKdmg4nXFI1BAiYPvZ/k3ouczZAQnbDprk1xqxJiFmFHyy8y6MuUq3slz5erNMtn6n87uVKw==
+  version "5.0.44"
+  resolved "https://registry.yarnpkg.com/@types/bytebuffer/-/bytebuffer-5.0.44.tgz#553015fb34db1fc3eb3f7b232bff91c006c251a1"
+  integrity sha512-k1qonHga/SfQT02NF633i+7tIfKd+cfC/8pjnedcfuXJNMWooss/FkCgRMSnLf2WorLjbuH4bfgAZEbtyHBDoQ==
   dependencies:
-    "@types/long" "*"
+    "@types/long" "^3.0.0"
     "@types/node" "*"
 
 "@types/cacheable-request@^6.0.1":
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/@types/cacheable-request/-/cacheable-request-6.0.2.tgz#c324da0197de0a98a2312156536ae262429ff6b9"
-  integrity sha512-B3xVo+dlKM6nnKTcmm5ZtY/OL8bOAOd2Olee9M1zft65ox50OzjEHW91sDiU9j6cvW8Ejg1/Qkf4xd2kugApUA==
+  version "6.0.3"
+  resolved "https://registry.yarnpkg.com/@types/cacheable-request/-/cacheable-request-6.0.3.tgz#a430b3260466ca7b5ca5bfd735693b36e7a9d183"
+  integrity sha512-IQ3EbTzGxIigb1I3qPZc1rWJnH0BmSKv5QYTalEwweFvyBDLSAe24zP0le/hyi7ecGfZVlIVAg4BZqb8WBwKqw==
   dependencies:
     "@types/http-cache-semantics" "*"
-    "@types/keyv" "*"
+    "@types/keyv" "^3.1.4"
     "@types/node" "*"
-    "@types/responselike" "*"
+    "@types/responselike" "^1.0.0"
 
 "@types/chai-as-promised@^7.1.2":
   version "7.1.5"
@@ -907,9 +918,9 @@
     "@types/chai" "*"
 
 "@types/chai@*":
-  version "4.3.1"
-  resolved "https://registry.yarnpkg.com/@types/chai/-/chai-4.3.1.tgz#e2c6e73e0bdeb2521d00756d099218e9f5d90a04"
-  integrity sha512-/zPMqDkzSZ8t3VtxOa4KPq7uzzW978M9Tvh+j7GHKuo6k6GTLxPJ4J5gE5cjfJ26pnXst0N5Hax8Sr0T2Mi9zQ==
+  version "4.3.5"
+  resolved "https://registry.yarnpkg.com/@types/chai/-/chai-4.3.5.tgz#ae69bcbb1bebb68c4ac0b11e9d8ed04526b3562b"
+  integrity sha512-mEo1sAde+UCE6b2hxn332f1g1E8WfYRu6p5SvTKr2ZKC1f7gFJXk4h5PyGP9Dt6gCaG8y8XhwnXWC6Iy2cmBng==
 
 "@types/chai@4.2.18":
   version "4.2.18"
@@ -927,16 +938,16 @@
   integrity sha512-jWi9DXx77hnzN4kHCNEvP/kab+nchRLTg9yjXYxjTcMBkuc5iBb3QuwJ4sPrb+nzy1GQjrfyfMqZOdR4i7opRQ==
 
 "@types/debug@^4.1.6":
-  version "4.1.7"
-  resolved "https://registry.yarnpkg.com/@types/debug/-/debug-4.1.7.tgz#7cc0ea761509124709b8b2d1090d8f6c17aadb82"
-  integrity sha512-9AonUzyTjXXhEOa0DnqpzZi6VHlqKMswga9EXjpXnnqxwLtdvPPtlO8evrI5D9S6asFRCQ6v+wpiUKbw+vKqyg==
+  version "4.1.8"
+  resolved "https://registry.yarnpkg.com/@types/debug/-/debug-4.1.8.tgz#cef723a5d0a90990313faec2d1e22aee5eecb317"
+  integrity sha512-/vPO1EPOs306Cvhwv7KfVfYvOJqA/S/AXjaHQiJboCZzcNDb+TIJFN9/2C9DZ//ijSKWioNyUxD792QmDJ+HKQ==
   dependencies:
     "@types/ms" "*"
 
 "@types/dompurify@^2.0.0":
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/@types/dompurify/-/dompurify-2.3.3.tgz#c24c92f698f77ed9cc9d9fa7888f90cf2bfaa23f"
-  integrity sha512-nnVQSgRVuZ/843oAfhA25eRSNzUFcBPk/LOiw5gm8mD9/X7CNcbRkQu/OsjCewO8+VIYfPxUnXvPEVGenw14+w==
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/@types/dompurify/-/dompurify-2.4.0.tgz#fd9706392a88e0e0e6d367f3588482d817df0ab9"
+  integrity sha512-IDBwO5IZhrKvHFUl+clZxgf3hn2b/lU6H1KaBShPkQyGJUQ0xwebezIPSuiyGwfz1UzJWQl4M7BDxtHtCCPlTg==
   dependencies:
     "@types/trusted-types" "*"
 
@@ -956,22 +967,17 @@
     "@types/estree" "*"
 
 "@types/eslint@*":
-  version "8.4.10"
-  resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-8.4.10.tgz#19731b9685c19ed1552da7052b6f668ed7eb64bb"
-  integrity sha512-Sl/HOqN8NKPmhWo2VBEPm0nvHnu2LL3v9vKo8MEq0EtbJ4eVzGPl41VNPvn5E1i5poMk4/XD8UriLHpJvEP/Nw==
+  version "8.44.1"
+  resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-8.44.1.tgz#d1811559bb6bcd1a76009e3f7883034b78a0415e"
+  integrity sha512-XpNDc4Z5Tb4x+SW1MriMVeIsMoONHCkWFMkR/aPJbzEsxqHy+4Glu/BqTdPrApfDeMaXbtNh6bseNgl5KaWrSg==
   dependencies:
     "@types/estree" "*"
     "@types/json-schema" "*"
 
-"@types/estree@*":
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.0.tgz#5fb2e536c1ae9bf35366eed879e827fa59ca41c2"
-  integrity sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ==
-
-"@types/estree@^0.0.51":
-  version "0.0.51"
-  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.51.tgz#cfd70924a25a3fd32b218e5e420e6897e1ac4f40"
-  integrity sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ==
+"@types/estree@*", "@types/estree@^1.0.0":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.1.tgz#aa22750962f3bf0e79d753d3cc067f010c95f194"
+  integrity sha512-LG4opVs2ANWZ1TJoKc937iMmNstM/d0ae1vNbnBvBhqCSezgVUOzcLCqbI5elV8Vy6WKwKjaqR+zO9VKirBBCA==
 
 "@types/filesize@3.6.0":
   version "3.6.0"
@@ -999,7 +1005,15 @@
   dependencies:
     "@types/node" "*"
 
-"@types/glob@*", "@types/glob@^7.1.1":
+"@types/glob@*":
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/@types/glob/-/glob-8.1.0.tgz#b63e70155391b0584dce44e7ea25190bbc38f2fc"
+  integrity sha512-IO+MJPVhoqz+28h1qLAcBEH2+xHMK6MTyHJc7MTnnYb6wsoLR29POVGJ7LycmVXIqyy/4/2ShP5sUwTXuOwb/w==
+  dependencies:
+    "@types/minimatch" "^5.1.2"
+    "@types/node" "*"
+
+"@types/glob@^7.1.1":
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.2.0.tgz#bc1b5bf3aa92f25bd5dd39f35c57361bdce5b2eb"
   integrity sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==
@@ -1040,9 +1054,9 @@
     "@types/istanbul-lib-report" "*"
 
 "@types/jquery@*":
-  version "3.5.14"
-  resolved "https://registry.yarnpkg.com/@types/jquery/-/jquery-3.5.14.tgz#ac8e11ee591e94d4d58da602cb3a5a8320dee577"
-  integrity sha512-X1gtMRMbziVQkErhTQmSe2jFwwENA/Zr+PprCkF63vFq+Yt5PZ4AlKqgmeNlwgn7dhsXEK888eIW2520EpC+xg==
+  version "3.5.16"
+  resolved "https://registry.yarnpkg.com/@types/jquery/-/jquery-3.5.16.tgz#632131baf30951915b0317d48c98e9890bdf051d"
+  integrity sha512-bsI7y4ZgeMkmpG9OM710RRzDFp+w4P1RGiIt30C1mSBT+ExCleeh4HObwgArnDFELmRrOpXgSYN9VF1hj+f1lw==
   dependencies:
     "@types/sizzle" "*"
 
@@ -1051,11 +1065,6 @@
   resolved "https://registry.yarnpkg.com/@types/js-cookie/-/js-cookie-2.2.7.tgz#226a9e31680835a6188e887f3988e60c04d3f6a3"
   integrity sha512-aLkWa0C0vO5b4Sr798E26QgOkss68Un0bLjs7u9qxzPT5CG+8DuNTffWES58YzJs3hrVAOs1wonycqEBqNJubA==
 
-"@types/json-buffer@~3.0.0":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@types/json-buffer/-/json-buffer-3.0.0.tgz#85c1ff0f0948fc159810d4b5be35bf8c20875f64"
-  integrity sha512-3YP80IxxFJB4b5tYC2SUPwkg0XQLiu0nWvhRgEatgjf+29IcWO9X1k8xRv5DGssJ/lCrjYTjQPcobJr2yWIVuQ==
-
 "@types/json-schema@*", "@types/json-schema@^7.0.12", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9":
   version "7.0.12"
   resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.12.tgz#d70faba7039d5fca54c83c7dbab41051d2b6f6cb"
@@ -1066,7 +1075,7 @@
   resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee"
   integrity sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==
 
-"@types/keyv@*":
+"@types/keyv@^3.1.4":
   version "3.1.4"
   resolved "https://registry.yarnpkg.com/@types/keyv/-/keyv-3.1.4.tgz#3ccdb1c6751b0c7e52300bcdacd5bcbf8faa75b6"
   integrity sha512-BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg==
@@ -1081,9 +1090,9 @@
     "@types/libsodium-wrappers" "*"
 
 "@types/libsodium-wrappers@*":
-  version "0.7.9"
-  resolved "https://registry.yarnpkg.com/@types/libsodium-wrappers/-/libsodium-wrappers-0.7.9.tgz#89c3ad2156d5143e64bce86cfeb0045a983aeccc"
-  integrity sha512-LisgKLlYQk19baQwjkBZZXdJL0KbeTpdEnrAfz5hQACbklCY0gVFnsKUyjfNWF1UQsCSjw93Sj5jSbiO8RPfdw==
+  version "0.7.10"
+  resolved "https://registry.yarnpkg.com/@types/libsodium-wrappers/-/libsodium-wrappers-0.7.10.tgz#a6ebde70d3b4af960fd802af8d0e3c7cfe281eb2"
+  integrity sha512-BqI9B92u+cM3ccp8mpHf+HzJ8fBlRwdmyd6+fz3p99m3V6ifT5O3zmOMi612PGkpeFeG/G6loxUnzlDNhfjPSA==
 
 "@types/linkify-it@^3.0.2":
   version "3.0.2"
@@ -1091,19 +1100,24 @@
   integrity sha512-HZQYqbiFVWufzCwexrvh694SOim8z2d+xJl5UNamcvQFejLY/2YUtzXHYi3cHdI7PMlS8ejH2slRAOJQ32aNbA==
 
 "@types/lodash@^4.14.194":
-  version "4.14.194"
-  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.194.tgz#b71eb6f7a0ff11bff59fc987134a093029258a76"
-  integrity sha512-r22s9tAS7imvBt2lyHC9B8AGwWnXaYb1tY09oyLkXDs4vArpYJzw09nj8MLx5VfciBPGIb+ZwG0ssYnEPJxn/g==
+  version "4.14.196"
+  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.196.tgz#a7c3d6fc52d8d71328b764e28e080b4169ec7a95"
+  integrity sha512-22y3o88f4a94mKljsZcanlNWPzO0uBsBdzLAngf2tp533LzZcQzb6+eZPJ+vCTt+bqF2XnvT9gejTLsAcJAJyQ==
 
-"@types/long@*", "@types/long@^4.0.1":
+"@types/long@^3.0.0":
+  version "3.0.32"
+  resolved "https://registry.yarnpkg.com/@types/long/-/long-3.0.32.tgz#f4e5af31e9e9b196d8e5fca8a5e2e20aa3d60b69"
+  integrity sha512-ZXyOOm83p7X8p3s0IYM3VeueNmHpkk/yMlP8CLeOnEcu6hIwPH7YjZBvhQkR0ZFS2DqZAxKtJ/M5fcuv3OU5BA==
+
+"@types/long@^4.0.1":
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/@types/long/-/long-4.0.2.tgz#b74129719fc8d11c01868010082d483b7545591a"
   integrity sha512-MqTGEo5bj5t157U6fA/BiDynNkn0YknVdh48CMPkTSpFTVmvao5UQmm7uEF6xBEo7qIMAlY/JSleYaE6VOdpaA==
 
-"@types/minimatch@*":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.5.tgz#1001cc5e6a3704b83c236027e77f2f58ea010f40"
-  integrity sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ==
+"@types/minimatch@*", "@types/minimatch@^5.1.2":
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-5.1.2.tgz#07508b45797cb81ec3f273011b054cd0755eddca"
+  integrity sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA==
 
 "@types/mocha@5.0.0":
   version "5.0.0"
@@ -1116,17 +1130,22 @@
   integrity sha512-iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA==
 
 "@types/node-fetch@^2.5.7":
-  version "2.6.2"
-  resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.6.2.tgz#d1a9c5fd049d9415dce61571557104dec3ec81da"
-  integrity sha512-DHqhlq5jeESLy19TYhLakJ07kNumXWjcDdxXsLUMJZ6ue8VZJj4kLPQVE/2mdHh3xZziNF1xppu5lwmS53HR+A==
+  version "2.6.4"
+  resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.6.4.tgz#1bc3a26de814f6bf466b25aeb1473fa1afe6a660"
+  integrity sha512-1ZX9fcN4Rvkvgv4E6PAY5WXUFWFcRWxZa3EW83UjycOB9ljJCedb2CupIP4RZMEwF/M3eTcCihbBRgwtGbg5Rg==
   dependencies:
     "@types/node" "*"
     form-data "^3.0.0"
 
-"@types/node@*", "@types/node@>=13.7.0", "@types/node@^18.11.18":
-  version "18.16.19"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-18.16.19.tgz#cb03fca8910fdeb7595b755126a8a78144714eea"
-  integrity sha512-IXl7o+R9iti9eBW4Wg2hx1xQDig183jj7YLn8F7udNceyfkbn1ZxmzZXuak20gR40D7pIkIY1kYGx5VIGbaHKA==
+"@types/node@*", "@types/node@>=13.7.0":
+  version "20.4.5"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.4.5.tgz#9dc0a5cb1ccce4f7a731660935ab70b9c00a5d69"
+  integrity sha512-rt40Nk13II9JwQBdeYqmbn2Q6IVTA5uPhvSO+JVqdXw/6/4glI6oR9ezty/A9Hg5u7JH4OmYmuQ+XvjKm0Datg==
+
+"@types/node@^18.11.18":
+  version "18.17.1"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-18.17.1.tgz#84c32903bf3a09f7878c391d31ff08f6fe7d8335"
+  integrity sha512-xlR1jahfizdplZYRU59JlUx9uzF1ARa8jbhM11ccpCJya8kvos5jwdm2ZAgxSCwOl0fq21svP18EVwPBXMQudw==
 
 "@types/pify@3.0.2":
   version "3.0.2"
@@ -1146,25 +1165,10 @@
   resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.5.tgz#5f19d2b85a98e9558036f6a3cacc8819420f05cf"
   integrity sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w==
 
-"@types/rc-slider@^8.6.5":
-  version "8.6.6"
-  resolved "https://registry.yarnpkg.com/@types/rc-slider/-/rc-slider-8.6.6.tgz#961ccfd0b8c632a9d8cdcc28b54d6be4781c419f"
-  integrity sha512-2Q3vwKrSm3PbgiMNwzxMkOaMtcAGi0xQ8WPeVKoabk1vNYHiVR44DMC3mr9jC2lhbxCBgGBJWF9sBhmnSDQ8Bg==
-  dependencies:
-    "@types/rc-tooltip" "*"
-    "@types/react" "*"
-
-"@types/rc-tooltip@*":
-  version "3.7.6"
-  resolved "https://registry.yarnpkg.com/@types/rc-tooltip/-/rc-tooltip-3.7.6.tgz#d3833b3f3e494ab14e4a95158f9f6b321042c97a"
-  integrity sha512-Otouf6HW49RSwtTa3EBdp0+BZoOQy3KDTEcVgLdZEgcYp4HB5nP6N3S6bTUkPtq3H5KmYBzEOaiq0SNMB/MY2g==
-  dependencies:
-    "@types/react" "*"
-
 "@types/react-dom@^17.0.2":
-  version "17.0.17"
-  resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-17.0.17.tgz#2e3743277a793a96a99f1bf87614598289da68a1"
-  integrity sha512-VjnqEmqGnasQKV0CWLevqMTXBYG9GbwuE6x3VetERLh0cq2LTptFE73MrQi2S7GkKXCf2GgwItB/melLnxfnsg==
+  version "17.0.20"
+  resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-17.0.20.tgz#e0c8901469d732b36d8473b40b679ad899da1b53"
+  integrity sha512-4pzIjSxDueZZ90F52mU3aPoogkHIoSIDG+oQ+wQK7Cy2B9S+MvOqY0uEA/qawKz381qrEDkvpwyt8Bm31I8sbA==
   dependencies:
     "@types/react" "^17"
 
@@ -1176,9 +1180,9 @@
     "@types/react" "*"
 
 "@types/react-redux@^7.1.24":
-  version "7.1.24"
-  resolved "https://registry.yarnpkg.com/@types/react-redux/-/react-redux-7.1.24.tgz#6caaff1603aba17b27d20f8ad073e4c077e975c0"
-  integrity sha512-7FkurKcS1k0FHZEtdbbgN8Oc6b+stGSfZYjQGicofJ0j4U0qIn/jaSvnP2pLwZKiai3/17xqqxkkrxTgN8UNbQ==
+  version "7.1.25"
+  resolved "https://registry.yarnpkg.com/@types/react-redux/-/react-redux-7.1.25.tgz#de841631205b24f9dfb4967dd4a7901e048f9a88"
+  integrity sha512-bAGh4e+w5D8dajd6InASVIyCo4pZLJ66oLb80F9OBLO1gKESbZcRCJpTT6uLXX+HAB57zw1WTdwJdAsewuTweg==
   dependencies:
     "@types/hoist-non-react-statics" "^3.3.0"
     "@types/react" "*"
@@ -1193,21 +1197,21 @@
     "@types/prop-types" "*"
     "@types/react" "*"
 
-"@types/react@*", "@types/react@^17", "@types/react@^17.0.2":
-  version "17.0.45"
-  resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.45.tgz#9b3d5b661fd26365fefef0e766a1c6c30ccf7b3f"
-  integrity sha512-YfhQ22Lah2e3CHPsb93tRwIGNiSwkuz1/blk4e6QrWS0jQzCSNbGLtOEYhPg02W0yGTTmpajp7dCTbBAMN3qsg==
+"@types/react@*", "@types/react@17.0.2", "@types/react@^17":
+  version "17.0.2"
+  resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.2.tgz#3de24c4efef902dd9795a49c75f760cbe4f7a5a8"
+  integrity sha512-Xt40xQsrkdvjn1EyWe1Bc0dJLcil/9x2vAuW7ya+PuQip4UYUaXyhzWmAbwRsdMgwOFHpfp7/FFZebDU6Y8VHA==
   dependencies:
     "@types/prop-types" "*"
-    "@types/scheduler" "*"
     csstype "^3.0.2"
 
-"@types/react@17.0.2":
-  version "17.0.2"
-  resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.2.tgz#3de24c4efef902dd9795a49c75f760cbe4f7a5a8"
-  integrity sha512-Xt40xQsrkdvjn1EyWe1Bc0dJLcil/9x2vAuW7ya+PuQip4UYUaXyhzWmAbwRsdMgwOFHpfp7/FFZebDU6Y8VHA==
+"@types/react@^17.0.2":
+  version "17.0.62"
+  resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.62.tgz#2efe8ddf8533500ec44b1334dd1a97caa2f860e3"
+  integrity sha512-eANCyz9DG8p/Vdhr0ZKST8JV12PhH2ACCDYlFw6DIO+D+ca+uP4jtEDEpVqXZrh/uZdXQGwk7whJa3ah5DtyLw==
   dependencies:
     "@types/prop-types" "*"
+    "@types/scheduler" "*"
     csstype "^3.0.2"
 
 "@types/redux-logger@3.0.7":
@@ -1217,7 +1221,7 @@
   dependencies:
     redux "^3.6.0"
 
-"@types/responselike@*", "@types/responselike@^1.0.0":
+"@types/responselike@^1.0.0":
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/@types/responselike/-/responselike-1.0.0.tgz#251f4fe7d154d2bad125abe1b429b23afd262e29"
   integrity sha512-85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA==
@@ -1238,9 +1242,9 @@
     "@types/node" "*"
 
 "@types/scheduler@*":
-  version "0.16.2"
-  resolved "https://registry.yarnpkg.com/@types/scheduler/-/scheduler-0.16.2.tgz#1a62f89525723dde24ba1b01b092bf5df8ad4d39"
-  integrity sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew==
+  version "0.16.3"
+  resolved "https://registry.yarnpkg.com/@types/scheduler/-/scheduler-0.16.3.tgz#cef09e3ec9af1d63d2a6cc5b383a737e24e6dcf5"
+  integrity sha512-5cJ8CB4yAx7BH1oMvdU0Jh9lrEXyPkar6F9G/ERswkCuvP4KQZfZkSjcMbAICCpQTN4OuZn8tz0HiKv9TGZgrQ==
 
 "@types/semver@5.5.0":
   version "5.5.0"
@@ -1275,23 +1279,23 @@
   integrity sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw==
 
 "@types/styled-components@^5.1.4":
-  version "5.1.25"
-  resolved "https://registry.yarnpkg.com/@types/styled-components/-/styled-components-5.1.25.tgz#0177c4ab5fa7c6ed0565d36f597393dae3f380ad"
-  integrity sha512-fgwl+0Pa8pdkwXRoVPP9JbqF0Ivo9llnmsm+7TCI330kbPIFd9qv1Lrhr37shf4tnxCOSu+/IgqM7uJXLWZZNQ==
+  version "5.1.26"
+  resolved "https://registry.yarnpkg.com/@types/styled-components/-/styled-components-5.1.26.tgz#5627e6812ee96d755028a98dae61d28e57c233af"
+  integrity sha512-KuKJ9Z6xb93uJiIyxo/+ksS7yLjS1KzG6iv5i78dhVg/X3u5t1H7juRWqVmodIdz6wGVaIApo1u01kmFRdJHVw==
   dependencies:
     "@types/hoist-non-react-statics" "*"
     "@types/react" "*"
     csstype "^3.0.2"
 
 "@types/trusted-types@*":
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/@types/trusted-types/-/trusted-types-2.0.2.tgz#fc25ad9943bcac11cceb8168db4f275e0e72e756"
-  integrity sha512-F5DIZ36YVLE+PN+Zwws4kJogq47hNgX3Nx6WyDJ3kcplxyke3XIzB8uK5n/Lpm1HBsbGzd6nmGehL8cPekP+Tg==
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/@types/trusted-types/-/trusted-types-2.0.3.tgz#a136f83b0758698df454e328759dbd3d44555311"
+  integrity sha512-NfQ4gyz38SL8sDNrSixxU2Os1a5xcdFxipAFxYEuLUlvU2uDwS4NUpsImcf1//SlWItCVMMLiylsxbmNMToV/g==
 
 "@types/underscore@*":
-  version "1.11.4"
-  resolved "https://registry.yarnpkg.com/@types/underscore/-/underscore-1.11.4.tgz#62e393f8bc4bd8a06154d110c7d042a93751def3"
-  integrity sha512-uO4CD2ELOjw8tasUrAhvnn2W4A0ZECOvMjCivJr4gA9pGgjv+qxKWY9GLTMVEK8ej85BxQOocUyE7hImmSQYcg==
+  version "1.11.6"
+  resolved "https://registry.yarnpkg.com/@types/underscore/-/underscore-1.11.6.tgz#266f210e8a1bf8fa714d3c86f3abdc07a8942b96"
+  integrity sha512-G2oC64I/sR817KDL2b2Mc7+diXyxcibyUeLMyexU4K/sG8hyt/YMlbBK0TVhx/YQ1ehfzgXhLuq2YQHIL4bXUQ==
 
 "@types/use-sync-external-store@^0.0.3":
   version "0.0.3"
@@ -1314,9 +1318,9 @@
   integrity sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA==
 
 "@types/yargs@^16.0.0":
-  version "16.0.4"
-  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-16.0.4.tgz#26aad98dd2c2a38e421086ea9ad42b9e51642977"
-  integrity sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==
+  version "16.0.5"
+  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-16.0.5.tgz#12cc86393985735a283e387936398c2f9e5f88e3"
+  integrity sha512-AxO/ADJOBFJScHbWhq2xAhlWP24rY4aCEG/NFaMvbT3X2MgRsLjhjQwsn0Zi5zn0LG9jUhCCZMeX9Dkuw6k+vQ==
   dependencies:
     "@types/yargs-parser" "*"
 
@@ -1335,15 +1339,15 @@
     "@types/node" "*"
 
 "@typescript-eslint/eslint-plugin@^6.1.0":
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.1.0.tgz#96f3ca6615717659d06c9f7161a1d14ab0c49c66"
-  integrity sha512-qg7Bm5TyP/I7iilGyp6DRqqkt8na00lI6HbjWZObgk3FFSzH5ypRwAHXJhJkwiRtTcfn+xYQIMOR5kJgpo6upw==
+  version "6.2.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.2.1.tgz#41b79923fee46a745a3a50cba1c33c622aa3c79a"
+  integrity sha512-iZVM/ALid9kO0+I81pnp1xmYiFyqibAHzrqX4q5YvvVEyJqY+e6rfTXSCsc2jUxGNqJqTfFSSij/NFkZBiBzLw==
   dependencies:
     "@eslint-community/regexpp" "^4.5.1"
-    "@typescript-eslint/scope-manager" "6.1.0"
-    "@typescript-eslint/type-utils" "6.1.0"
-    "@typescript-eslint/utils" "6.1.0"
-    "@typescript-eslint/visitor-keys" "6.1.0"
+    "@typescript-eslint/scope-manager" "6.2.1"
+    "@typescript-eslint/type-utils" "6.2.1"
+    "@typescript-eslint/utils" "6.2.1"
+    "@typescript-eslint/visitor-keys" "6.2.1"
     debug "^4.3.4"
     graphemer "^1.4.0"
     ignore "^5.2.4"
@@ -1353,71 +1357,71 @@
     ts-api-utils "^1.0.1"
 
 "@typescript-eslint/parser@^6.1.0":
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-6.1.0.tgz#3135bf65dca5340d8650703eb8cb83113e156ee5"
-  integrity sha512-hIzCPvX4vDs4qL07SYzyomamcs2/tQYXg5DtdAfj35AyJ5PIUqhsLf4YrEIFzZcND7R2E8tpQIZKayxg8/6Wbw==
+  version "6.2.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-6.2.1.tgz#e18a31eea1cca8841a565f1701960c8123ed07f9"
+  integrity sha512-Ld+uL1kYFU8e6btqBFpsHkwQ35rw30IWpdQxgOqOh4NfxSDH6uCkah1ks8R/RgQqI5hHPXMaLy9fbFseIe+dIg==
   dependencies:
-    "@typescript-eslint/scope-manager" "6.1.0"
-    "@typescript-eslint/types" "6.1.0"
-    "@typescript-eslint/typescript-estree" "6.1.0"
-    "@typescript-eslint/visitor-keys" "6.1.0"
+    "@typescript-eslint/scope-manager" "6.2.1"
+    "@typescript-eslint/types" "6.2.1"
+    "@typescript-eslint/typescript-estree" "6.2.1"
+    "@typescript-eslint/visitor-keys" "6.2.1"
     debug "^4.3.4"
 
-"@typescript-eslint/scope-manager@6.1.0":
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-6.1.0.tgz#a6cdbe11630614f8c04867858a42dd56590796ed"
-  integrity sha512-AxjgxDn27hgPpe2rQe19k0tXw84YCOsjDJ2r61cIebq1t+AIxbgiXKvD4999Wk49GVaAcdJ/d49FYel+Pp3jjw==
+"@typescript-eslint/scope-manager@6.2.1":
+  version "6.2.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-6.2.1.tgz#b6f43a867b84e5671fe531f2b762e0b68f7cf0c4"
+  integrity sha512-UCqBF9WFqv64xNsIEPfBtenbfodPXsJ3nPAr55mGPkQIkiQvgoWNo+astj9ZUfJfVKiYgAZDMnM6dIpsxUMp3Q==
   dependencies:
-    "@typescript-eslint/types" "6.1.0"
-    "@typescript-eslint/visitor-keys" "6.1.0"
+    "@typescript-eslint/types" "6.2.1"
+    "@typescript-eslint/visitor-keys" "6.2.1"
 
-"@typescript-eslint/type-utils@6.1.0":
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-6.1.0.tgz#21cc6c3bc1980b03f9eb4e64580d0c5be6f08215"
-  integrity sha512-kFXBx6QWS1ZZ5Ni89TyT1X9Ag6RXVIVhqDs0vZE/jUeWlBv/ixq2diua6G7ece6+fXw3TvNRxP77/5mOMusx2w==
+"@typescript-eslint/type-utils@6.2.1":
+  version "6.2.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-6.2.1.tgz#8eb8a2cccdf39cd7cf93e02bd2c3782dc90b0525"
+  integrity sha512-fTfCgomBMIgu2Dh2Or3gMYgoNAnQm3RLtRp+jP7A8fY+LJ2+9PNpi5p6QB5C4RSP+U3cjI0vDlI3mspAkpPVbQ==
   dependencies:
-    "@typescript-eslint/typescript-estree" "6.1.0"
-    "@typescript-eslint/utils" "6.1.0"
+    "@typescript-eslint/typescript-estree" "6.2.1"
+    "@typescript-eslint/utils" "6.2.1"
     debug "^4.3.4"
     ts-api-utils "^1.0.1"
 
-"@typescript-eslint/types@6.1.0":
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-6.1.0.tgz#2d607c62827bb416ada5c96ebfa2ef84e45a8dfa"
-  integrity sha512-+Gfd5NHCpDoHDOaU/yIF3WWRI2PcBRKKpP91ZcVbL0t5tQpqYWBs3z/GGhvU+EV1D0262g9XCnyqQh19prU0JQ==
+"@typescript-eslint/types@6.2.1":
+  version "6.2.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-6.2.1.tgz#7fcdeceb503aab601274bf5e210207050d88c8ab"
+  integrity sha512-528bGcoelrpw+sETlyM91k51Arl2ajbNT9L4JwoXE2dvRe1yd8Q64E4OL7vHYw31mlnVsf+BeeLyAZUEQtqahQ==
 
-"@typescript-eslint/typescript-estree@6.1.0":
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-6.1.0.tgz#ea382f6482ba698d7e993a88ce5391ea7a66c33d"
-  integrity sha512-nUKAPWOaP/tQjU1IQw9sOPCDavs/iU5iYLiY/6u7gxS7oKQoi4aUxXS1nrrVGTyBBaGesjkcwwHkbkiD5eBvcg==
+"@typescript-eslint/typescript-estree@6.2.1":
+  version "6.2.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-6.2.1.tgz#2af6e90c1e91cb725a5fe1682841a3f74549389e"
+  integrity sha512-G+UJeQx9AKBHRQBpmvr8T/3K5bJa485eu+4tQBxFq0KoT22+jJyzo1B50JDT9QdC1DEmWQfdKsa8ybiNWYsi0Q==
   dependencies:
-    "@typescript-eslint/types" "6.1.0"
-    "@typescript-eslint/visitor-keys" "6.1.0"
+    "@typescript-eslint/types" "6.2.1"
+    "@typescript-eslint/visitor-keys" "6.2.1"
     debug "^4.3.4"
     globby "^11.1.0"
     is-glob "^4.0.3"
     semver "^7.5.4"
     ts-api-utils "^1.0.1"
 
-"@typescript-eslint/utils@6.1.0":
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-6.1.0.tgz#1641843792b4e3451cc692e2c73055df8b26f453"
-  integrity sha512-wp652EogZlKmQoMS5hAvWqRKplXvkuOnNzZSE0PVvsKjpexd/XznRVHAtrfHFYmqaJz0DFkjlDsGYC9OXw+OhQ==
+"@typescript-eslint/utils@6.2.1":
+  version "6.2.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-6.2.1.tgz#2aa4279ec13053d05615bcbde2398e1e8f08c334"
+  integrity sha512-eBIXQeupYmxVB6S7x+B9SdBeB6qIdXKjgQBge2J+Ouv8h9Cxm5dHf/gfAZA6dkMaag+03HdbVInuXMmqFB/lKQ==
   dependencies:
     "@eslint-community/eslint-utils" "^4.4.0"
     "@types/json-schema" "^7.0.12"
     "@types/semver" "^7.5.0"
-    "@typescript-eslint/scope-manager" "6.1.0"
-    "@typescript-eslint/types" "6.1.0"
-    "@typescript-eslint/typescript-estree" "6.1.0"
+    "@typescript-eslint/scope-manager" "6.2.1"
+    "@typescript-eslint/types" "6.2.1"
+    "@typescript-eslint/typescript-estree" "6.2.1"
     semver "^7.5.4"
 
-"@typescript-eslint/visitor-keys@6.1.0":
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-6.1.0.tgz#d2b84dff6b58944d3257ea03687e269a788c73be"
-  integrity sha512-yQeh+EXhquh119Eis4k0kYhj9vmFzNpbhM3LftWQVwqVjipCkwHBQOZutcYW+JVkjtTG9k8nrZU1UoNedPDd1A==
+"@typescript-eslint/visitor-keys@6.2.1":
+  version "6.2.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-6.2.1.tgz#442e7c09fe94b715a54ebe30e967987c3c41fbf4"
+  integrity sha512-iTN6w3k2JEZ7cyVdZJTVJx2Lv7t6zFA8DCrJEHD2mwfc16AEvvBWVhbFh34XyG2NORCd0viIgQY1+u7kPI0WpA==
   dependencies:
-    "@typescript-eslint/types" "6.1.0"
+    "@typescript-eslint/types" "6.2.1"
     eslint-visitor-keys "^3.4.1"
 
 "@ungap/promise-all-settled@1.1.2":
@@ -1425,125 +1429,125 @@
   resolved "https://registry.yarnpkg.com/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz#aa58042711d6e3275dd37dc597e5d31e8c290a44"
   integrity sha512-sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q==
 
-"@webassemblyjs/ast@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.11.1.tgz#2bfd767eae1a6996f432ff7e8d7fc75679c0b6a7"
-  integrity sha512-ukBh14qFLjxTQNTXocdyksN5QdM28S1CxHt2rdskFyL+xFV7VremuBLVbmCePj+URalXBENx/9Lm7lnhihtCSw==
+"@webassemblyjs/ast@1.11.6", "@webassemblyjs/ast@^1.11.5":
+  version "1.11.6"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.11.6.tgz#db046555d3c413f8966ca50a95176a0e2c642e24"
+  integrity sha512-IN1xI7PwOvLPgjcf180gC1bqn3q/QaOCwYUahIOhbYUu8KA/3tw2RT/T0Gidi1l7Hhj5D/INhJxiICObqpMu4Q==
   dependencies:
-    "@webassemblyjs/helper-numbers" "1.11.1"
-    "@webassemblyjs/helper-wasm-bytecode" "1.11.1"
+    "@webassemblyjs/helper-numbers" "1.11.6"
+    "@webassemblyjs/helper-wasm-bytecode" "1.11.6"
 
-"@webassemblyjs/floating-point-hex-parser@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.1.tgz#f6c61a705f0fd7a6aecaa4e8198f23d9dc179e4f"
-  integrity sha512-iGRfyc5Bq+NnNuX8b5hwBrRjzf0ocrJPI6GWFodBFzmFnyvrQ83SHKhmilCU/8Jv67i4GJZBMhEzltxzcNagtQ==
+"@webassemblyjs/floating-point-hex-parser@1.11.6":
+  version "1.11.6"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.6.tgz#dacbcb95aff135c8260f77fa3b4c5fea600a6431"
+  integrity sha512-ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw==
 
-"@webassemblyjs/helper-api-error@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.1.tgz#1a63192d8788e5c012800ba6a7a46c705288fd16"
-  integrity sha512-RlhS8CBCXfRUR/cwo2ho9bkheSXG0+NwooXcc3PAILALf2QLdFyj7KGsKRbVc95hZnhnERon4kW/D3SZpp6Tcg==
+"@webassemblyjs/helper-api-error@1.11.6":
+  version "1.11.6"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.6.tgz#6132f68c4acd59dcd141c44b18cbebbd9f2fa768"
+  integrity sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q==
 
-"@webassemblyjs/helper-buffer@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.1.tgz#832a900eb444884cde9a7cad467f81500f5e5ab5"
-  integrity sha512-gwikF65aDNeeXa8JxXa2BAk+REjSyhrNC9ZwdT0f8jc4dQQeDQ7G4m0f2QCLPJiMTTO6wfDmRmj/pW0PsUvIcA==
+"@webassemblyjs/helper-buffer@1.11.6":
+  version "1.11.6"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.6.tgz#b66d73c43e296fd5e88006f18524feb0f2c7c093"
+  integrity sha512-z3nFzdcp1mb8nEOFFk8DrYLpHvhKC3grJD2ardfKOzmbmJvEf/tPIqCY+sNcwZIY8ZD7IkB2l7/pqhUhqm7hLA==
 
-"@webassemblyjs/helper-numbers@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.1.tgz#64d81da219fbbba1e3bd1bfc74f6e8c4e10a62ae"
-  integrity sha512-vDkbxiB8zfnPdNK9Rajcey5C0w+QJugEglN0of+kmO8l7lDb77AnlKYQF7aarZuCrv+l0UvqL+68gSDr3k9LPQ==
+"@webassemblyjs/helper-numbers@1.11.6":
+  version "1.11.6"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.6.tgz#cbce5e7e0c1bd32cf4905ae444ef64cea919f1b5"
+  integrity sha512-vUIhZ8LZoIWHBohiEObxVm6hwP034jwmc9kuq5GdHZH0wiLVLIPcMCdpJzG4C11cHoQ25TFIQj9kaVADVX7N3g==
   dependencies:
-    "@webassemblyjs/floating-point-hex-parser" "1.11.1"
-    "@webassemblyjs/helper-api-error" "1.11.1"
+    "@webassemblyjs/floating-point-hex-parser" "1.11.6"
+    "@webassemblyjs/helper-api-error" "1.11.6"
     "@xtuc/long" "4.2.2"
 
-"@webassemblyjs/helper-wasm-bytecode@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.1.tgz#f328241e41e7b199d0b20c18e88429c4433295e1"
-  integrity sha512-PvpoOGiJwXeTrSf/qfudJhwlvDQxFgelbMqtq52WWiXC6Xgg1IREdngmPN3bs4RoO83PnL/nFrxucXj1+BX62Q==
+"@webassemblyjs/helper-wasm-bytecode@1.11.6":
+  version "1.11.6"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.6.tgz#bb2ebdb3b83aa26d9baad4c46d4315283acd51e9"
+  integrity sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA==
 
-"@webassemblyjs/helper-wasm-section@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.1.tgz#21ee065a7b635f319e738f0dd73bfbda281c097a"
-  integrity sha512-10P9No29rYX1j7F3EVPX3JvGPQPae+AomuSTPiF9eBQeChHI6iqjMIwR9JmOJXwpnn/oVGDk7I5IlskuMwU/pg==
+"@webassemblyjs/helper-wasm-section@1.11.6":
+  version "1.11.6"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.6.tgz#ff97f3863c55ee7f580fd5c41a381e9def4aa577"
+  integrity sha512-LPpZbSOwTpEC2cgn4hTydySy1Ke+XEu+ETXuoyvuyezHO3Kjdu90KK95Sh9xTbmjrCsUwvWwCOQQNta37VrS9g==
   dependencies:
-    "@webassemblyjs/ast" "1.11.1"
-    "@webassemblyjs/helper-buffer" "1.11.1"
-    "@webassemblyjs/helper-wasm-bytecode" "1.11.1"
-    "@webassemblyjs/wasm-gen" "1.11.1"
+    "@webassemblyjs/ast" "1.11.6"
+    "@webassemblyjs/helper-buffer" "1.11.6"
+    "@webassemblyjs/helper-wasm-bytecode" "1.11.6"
+    "@webassemblyjs/wasm-gen" "1.11.6"
 
-"@webassemblyjs/ieee754@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.11.1.tgz#963929e9bbd05709e7e12243a099180812992614"
-  integrity sha512-hJ87QIPtAMKbFq6CGTkZYJivEwZDbQUgYd3qKSadTNOhVY7p+gfP6Sr0lLRVTaG1JjFj+r3YchoqRYxNH3M0GQ==
+"@webassemblyjs/ieee754@1.11.6":
+  version "1.11.6"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.11.6.tgz#bb665c91d0b14fffceb0e38298c329af043c6e3a"
+  integrity sha512-LM4p2csPNvbij6U1f19v6WR56QZ8JcHg3QIJTlSwzFcmx6WSORicYj6I63f9yU1kEUtrpG+kjkiIAkevHpDXrg==
   dependencies:
     "@xtuc/ieee754" "^1.2.0"
 
-"@webassemblyjs/leb128@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.11.1.tgz#ce814b45574e93d76bae1fb2644ab9cdd9527aa5"
-  integrity sha512-BJ2P0hNZ0u+Th1YZXJpzW6miwqQUGcIHT1G/sf72gLVD9DZ5AdYTqPNbHZh6K1M5VmKvFXwGSWZADz+qBWxeRw==
+"@webassemblyjs/leb128@1.11.6":
+  version "1.11.6"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.11.6.tgz#70e60e5e82f9ac81118bc25381a0b283893240d7"
+  integrity sha512-m7a0FhE67DQXgouf1tbN5XQcdWoNgaAuoULHIfGFIEVKA6tu/edls6XnIlkmS6FrXAquJRPni3ZZKjw6FSPjPQ==
   dependencies:
     "@xtuc/long" "4.2.2"
 
-"@webassemblyjs/utf8@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.11.1.tgz#d1f8b764369e7c6e6bae350e854dec9a59f0a3ff"
-  integrity sha512-9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ==
-
-"@webassemblyjs/wasm-edit@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.1.tgz#ad206ebf4bf95a058ce9880a8c092c5dec8193d6"
-  integrity sha512-g+RsupUC1aTHfR8CDgnsVRVZFJqdkFHpsHMfJuWQzWU3tvnLC07UqHICfP+4XyL2tnr1amvl1Sdp06TnYCmVkA==
-  dependencies:
-    "@webassemblyjs/ast" "1.11.1"
-    "@webassemblyjs/helper-buffer" "1.11.1"
-    "@webassemblyjs/helper-wasm-bytecode" "1.11.1"
-    "@webassemblyjs/helper-wasm-section" "1.11.1"
-    "@webassemblyjs/wasm-gen" "1.11.1"
-    "@webassemblyjs/wasm-opt" "1.11.1"
-    "@webassemblyjs/wasm-parser" "1.11.1"
-    "@webassemblyjs/wast-printer" "1.11.1"
-
-"@webassemblyjs/wasm-gen@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.1.tgz#86c5ea304849759b7d88c47a32f4f039ae3c8f76"
-  integrity sha512-F7QqKXwwNlMmsulj6+O7r4mmtAlCWfO/0HdgOxSklZfQcDu0TpLiD1mRt/zF25Bk59FIjEuGAIyn5ei4yMfLhA==
-  dependencies:
-    "@webassemblyjs/ast" "1.11.1"
-    "@webassemblyjs/helper-wasm-bytecode" "1.11.1"
-    "@webassemblyjs/ieee754" "1.11.1"
-    "@webassemblyjs/leb128" "1.11.1"
-    "@webassemblyjs/utf8" "1.11.1"
-
-"@webassemblyjs/wasm-opt@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.1.tgz#657b4c2202f4cf3b345f8a4c6461c8c2418985f2"
-  integrity sha512-VqnkNqnZlU5EB64pp1l7hdm3hmQw7Vgqa0KF/KCNO9sIpI6Fk6brDEiX+iCOYrvMuBWDws0NkTOxYEb85XQHHw==
-  dependencies:
-    "@webassemblyjs/ast" "1.11.1"
-    "@webassemblyjs/helper-buffer" "1.11.1"
-    "@webassemblyjs/wasm-gen" "1.11.1"
-    "@webassemblyjs/wasm-parser" "1.11.1"
-
-"@webassemblyjs/wasm-parser@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.1.tgz#86ca734534f417e9bd3c67c7a1c75d8be41fb199"
-  integrity sha512-rrBujw+dJu32gYB7/Lup6UhdkPx9S9SnobZzRVL7VcBH9Bt9bCBLEuX/YXOOtBsOZ4NQrRykKhffRWHvigQvOA==
-  dependencies:
-    "@webassemblyjs/ast" "1.11.1"
-    "@webassemblyjs/helper-api-error" "1.11.1"
-    "@webassemblyjs/helper-wasm-bytecode" "1.11.1"
-    "@webassemblyjs/ieee754" "1.11.1"
-    "@webassemblyjs/leb128" "1.11.1"
-    "@webassemblyjs/utf8" "1.11.1"
-
-"@webassemblyjs/wast-printer@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.11.1.tgz#d0c73beda8eec5426f10ae8ef55cee5e7084c2f0"
-  integrity sha512-IQboUWM4eKzWW+N/jij2sRatKMh99QEelo3Eb2q0qXkvPRISAj8Qxtmw5itwqK+TTkBuUIE45AxYPToqPtL5gg==
-  dependencies:
-    "@webassemblyjs/ast" "1.11.1"
+"@webassemblyjs/utf8@1.11.6":
+  version "1.11.6"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.11.6.tgz#90f8bc34c561595fe156603be7253cdbcd0fab5a"
+  integrity sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA==
+
+"@webassemblyjs/wasm-edit@^1.11.5":
+  version "1.11.6"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.6.tgz#c72fa8220524c9b416249f3d94c2958dfe70ceab"
+  integrity sha512-Ybn2I6fnfIGuCR+Faaz7YcvtBKxvoLV3Lebn1tM4o/IAJzmi9AWYIPWpyBfU8cC+JxAO57bk4+zdsTjJR+VTOw==
+  dependencies:
+    "@webassemblyjs/ast" "1.11.6"
+    "@webassemblyjs/helper-buffer" "1.11.6"
+    "@webassemblyjs/helper-wasm-bytecode" "1.11.6"
+    "@webassemblyjs/helper-wasm-section" "1.11.6"
+    "@webassemblyjs/wasm-gen" "1.11.6"
+    "@webassemblyjs/wasm-opt" "1.11.6"
+    "@webassemblyjs/wasm-parser" "1.11.6"
+    "@webassemblyjs/wast-printer" "1.11.6"
+
+"@webassemblyjs/wasm-gen@1.11.6":
+  version "1.11.6"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.6.tgz#fb5283e0e8b4551cc4e9c3c0d7184a65faf7c268"
+  integrity sha512-3XOqkZP/y6B4F0PBAXvI1/bky7GryoogUtfwExeP/v7Nzwo1QLcq5oQmpKlftZLbT+ERUOAZVQjuNVak6UXjPA==
+  dependencies:
+    "@webassemblyjs/ast" "1.11.6"
+    "@webassemblyjs/helper-wasm-bytecode" "1.11.6"
+    "@webassemblyjs/ieee754" "1.11.6"
+    "@webassemblyjs/leb128" "1.11.6"
+    "@webassemblyjs/utf8" "1.11.6"
+
+"@webassemblyjs/wasm-opt@1.11.6":
+  version "1.11.6"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.6.tgz#d9a22d651248422ca498b09aa3232a81041487c2"
+  integrity sha512-cOrKuLRE7PCe6AsOVl7WasYf3wbSo4CeOk6PkrjS7g57MFfVUF9u6ysQBBODX0LdgSvQqRiGz3CXvIDKcPNy4g==
+  dependencies:
+    "@webassemblyjs/ast" "1.11.6"
+    "@webassemblyjs/helper-buffer" "1.11.6"
+    "@webassemblyjs/wasm-gen" "1.11.6"
+    "@webassemblyjs/wasm-parser" "1.11.6"
+
+"@webassemblyjs/wasm-parser@1.11.6", "@webassemblyjs/wasm-parser@^1.11.5":
+  version "1.11.6"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.6.tgz#bb85378c527df824004812bbdb784eea539174a1"
+  integrity sha512-6ZwPeGzMJM3Dqp3hCsLgESxBGtT/OeCvCZ4TA1JUPYgmhAx38tTPR9JaKy0S5H3evQpO/h2uWs2j6Yc/fjkpTQ==
+  dependencies:
+    "@webassemblyjs/ast" "1.11.6"
+    "@webassemblyjs/helper-api-error" "1.11.6"
+    "@webassemblyjs/helper-wasm-bytecode" "1.11.6"
+    "@webassemblyjs/ieee754" "1.11.6"
+    "@webassemblyjs/leb128" "1.11.6"
+    "@webassemblyjs/utf8" "1.11.6"
+
+"@webassemblyjs/wast-printer@1.11.6":
+  version "1.11.6"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.11.6.tgz#a7bf8dd7e362aeb1668ff43f35cb849f188eff20"
+  integrity sha512-JM7AhRcE+yW2GWYaKeHL5vt4xqee5N2WcezptmgyhNS+ScggqcT1OtXykhAb13Sn5Yas0j2uv9tHgrjwvzAP4A==
+  dependencies:
+    "@webassemblyjs/ast" "1.11.6"
     "@xtuc/long" "4.2.2"
 
 "@webpack-cli/configtest@^2.1.1":
@@ -1561,6 +1565,11 @@
   resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-2.0.5.tgz#325db42395cd49fe6c14057f9a900e427df8810e"
   integrity sha512-lqaoKnRYBdo1UgDX8uF24AfGMifWK19TxPmM5FHc2vAGxrJ/qtyUyFBWoY1tISZdelsQ5fBcOusifo5o5wSJxQ==
 
+"@xmldom/xmldom@^0.8.8":
+  version "0.8.10"
+  resolved "https://registry.yarnpkg.com/@xmldom/xmldom/-/xmldom-0.8.10.tgz#a1337ca426aa61cef9fe15b5b28e340a72f6fa99"
+  integrity sha512-2WALfTl4xo2SkGCYRt6rDTFfk9R1czmBvUQy12gK2KuRKIpWEhcbbzy8EZXtz/jkRqHX8bFEc6FC1HjX4TUWYw==
+
 "@xobotyi/scrollbar-width@^1.9.5":
   version "1.9.5"
   resolved "https://registry.yarnpkg.com/@xobotyi/scrollbar-width/-/scrollbar-width-1.9.5.tgz#80224a6919272f405b87913ca13b92929bdf3c4d"
@@ -1593,28 +1602,21 @@ abort-controller@3.0.0:
   dependencies:
     event-target-shim "^5.0.0"
 
-acorn-import-assertions@^1.7.6:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz#ba2b5939ce62c238db6d93d81c9b111b29b855e9"
-  integrity sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==
+acorn-import-assertions@^1.9.0:
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz#507276249d684797c84e0734ef84860334cfb1ac"
+  integrity sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA==
 
 acorn-jsx@^5.3.2:
   version "5.3.2"
   resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937"
   integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==
 
-acorn@^8.5.0, acorn@^8.7.1, acorn@^8.9.0:
+acorn@^8.7.1, acorn@^8.8.2, acorn@^8.9.0:
   version "8.10.0"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.10.0.tgz#8be5b3907a67221a81ab23c7889c4c5526b62ec5"
   integrity sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==
 
-add-dom-event-listener@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/add-dom-event-listener/-/add-dom-event-listener-1.1.0.tgz#6a92db3a0dd0abc254e095c0f1dc14acbbaae310"
-  integrity sha512-WCxx1ixHT0GQU9hb0KI/mhgRQhnU+U3GvwY6ZvVjYq8rsihIGoaIOUbY0yMPBxLH5MDtr0kz3fisWGNcbWW7Jw==
-  dependencies:
-    object-assign "4.x"
-
 agent-base@6, agent-base@^6.0.2:
   version "6.0.2"
   resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77"
@@ -1634,7 +1636,7 @@ ajv-keywords@^3.4.1, ajv-keywords@^3.5.2:
   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d"
   integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==
 
-ajv-keywords@^5.0.0:
+ajv-keywords@^5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-5.1.0.tgz#69d4d385a4733cdbeab44964a1170a88f87f0e16"
   integrity sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==
@@ -1651,7 +1653,7 @@ ajv@^6.10.0, ajv@^6.12.0, ajv@^6.12.4, ajv@^6.12.5:
     json-schema-traverse "^0.4.1"
     uri-js "^4.2.2"
 
-ajv@^8.0.0, ajv@^8.8.0:
+ajv@^8.0.0, ajv@^8.9.0:
   version "8.12.0"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.12.0.tgz#d1a0527323e22f53562c567c00991577dfbe19d1"
   integrity sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==
@@ -1703,9 +1705,9 @@ ansi-styles@^5.0.0:
   integrity sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==
 
 anymatch@~3.1.2:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.2.tgz#c0557c096af32f106198f4f4e2a383537e378716"
-  integrity sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.3.tgz#790c58b19ba1720a84205b57c618d5ad8524973e"
+  integrity sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==
   dependencies:
     normalize-path "^3.0.0"
     picomatch "^2.0.4"
@@ -1785,9 +1787,9 @@ app-builder-lib@23.6.0:
   integrity sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==
 
 are-we-there-yet@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-3.0.0.tgz#ba20bd6b553e31d62fc8c31bd23d22b95734390d"
-  integrity sha512-0GWpv50YSOcLXaN6/FAKY3vfRbllXWV2xvfA/oKJF8pzFhWXPV+yjhJXDBbjscDYowv7Yw1A3uigpzn5iEGTyw==
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-3.0.1.tgz#679df222b278c64f2cdba1175cdc00b0d96164bd"
+  integrity sha512-QZW4EDmGwlYur0Yyf/b2uGucHQMa8aFUP7eu9ddR73vvhFyt4V0Vl3QHPcTNJ8l6qYOBdxgXdnBXQrHilfRQBg==
   dependencies:
     delegates "^1.0.0"
     readable-stream "^3.6.0"
@@ -1821,6 +1823,17 @@ array-union@^2.1.0:
   resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d"
   integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==
 
+array.prototype.findlastindex@^1.2.2:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.2.tgz#bc229aef98f6bd0533a2bc61ff95209875526c9b"
+  integrity sha512-tb5thFFlUcp7NdNF6/MpDk/1r/4awWG1FIz3YqDf+/zJSTezBb+/5WViH41obXULHVpDzoiCLpJ/ZO9YbJMsdw==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.1.4"
+    es-abstract "^1.20.4"
+    es-shim-unscopables "^1.0.0"
+    get-intrinsic "^1.1.3"
+
 array.prototype.flat@^1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.3.1.tgz#ffc6576a7ca3efc2f46a143b9d1dda9b4b3cf5e2"
@@ -1864,18 +1877,6 @@ arraybuffer.prototype.slice@^1.0.1:
     is-array-buffer "^3.0.2"
     is-shared-array-buffer "^1.0.2"
 
-asar@3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/asar/-/asar-3.1.0.tgz#70b0509449fe3daccc63beb4d3c7d2e24d3c6473"
-  integrity sha512-vyxPxP5arcAqN4F/ebHd/HhwnAiZtwhglvdmc7BR2f0ywbVNTOpSeyhLDbGXtE/y58hv1oC75TaNIXutnsOZsQ==
-  dependencies:
-    chromium-pickle-js "^0.2.0"
-    commander "^5.0.0"
-    glob "^7.1.6"
-    minimatch "^3.0.4"
-  optionalDependencies:
-    "@types/glob" "^7.1.1"
-
 asar@^3.1.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/asar/-/asar-3.2.0.tgz#e6edb5edd6f627ebef04db62f771c61bea9c1221"
@@ -1944,44 +1945,24 @@ available-typed-arrays@^1.0.5:
   integrity sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==
 
 axios@^1.3.2:
-  version "1.3.6"
-  resolved "https://registry.yarnpkg.com/axios/-/axios-1.3.6.tgz#1ace9a9fb994314b5f6327960918406fa92c6646"
-  integrity sha512-PEcdkk7JcdPiMDkvM4K6ZBRYq9keuVJsToxm2zQIM70Qqo2WHTdJZMXcG9X+RmRp2VPNUQC8W1RAGbgt6b1yMg==
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-1.4.0.tgz#38a7bf1224cd308de271146038b551d725f0be1f"
+  integrity sha512-S4XCWMEmzvo64T9GfvQDOXgYRDJ/wsSZc7Jvdgx5u1sd0JwsuPLqb3SYmusag+edF6ziyMensPVqLTSc1PiSEA==
   dependencies:
     follow-redirects "^1.15.0"
     form-data "^4.0.0"
     proxy-from-env "^1.1.0"
 
-babel-plugin-dynamic-import-node@^2.3.3:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz#84fda19c976ec5c6defef57f9427b3def66e17a3"
-  integrity sha512-jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ==
-  dependencies:
-    object.assign "^4.1.0"
-
 "babel-plugin-styled-components@>= 1":
-  version "2.0.7"
-  resolved "https://registry.yarnpkg.com/babel-plugin-styled-components/-/babel-plugin-styled-components-2.0.7.tgz#c81ef34b713f9da2b7d3f5550df0d1e19e798086"
-  integrity sha512-i7YhvPgVqRKfoQ66toiZ06jPNA3p6ierpfUuEWxNF+fV27Uv5gxBkf8KZLHUCc1nFA9j6+80pYoIpqCeyW3/bA==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.16.0"
-    "@babel/helper-module-imports" "^7.16.0"
-    babel-plugin-syntax-jsx "^6.18.0"
-    lodash "^4.17.11"
-    picomatch "^2.3.0"
-
-babel-plugin-syntax-jsx@^6.18.0:
-  version "6.18.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz#0af32a9a6e13ca7a3fd5069e62d7b0f58d0d8946"
-  integrity sha512-qrPaCSo9c8RHNRHIotaufGbuOBN8rtdC4QrrFFc43vyWCCz7Kl7GL1PGaXtMGQZUXrkCjNEgxDfmAuAabr/rlw==
-
-babel-runtime@6.x, babel-runtime@^6.26.0:
-  version "6.26.0"
-  resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe"
-  integrity sha512-ITKNuq2wKlW1fJg9sSW52eepoYgZBggvOAHC0u/CYu/qxQ9EVzThCgR69BnSXLHjy2f7SY5zaQ4yt7H9ZVxY2g==
-  dependencies:
-    core-js "^2.4.0"
-    regenerator-runtime "^0.11.0"
+  version "2.1.4"
+  resolved "https://registry.yarnpkg.com/babel-plugin-styled-components/-/babel-plugin-styled-components-2.1.4.tgz#9a1f37c7f32ef927b4b008b529feb4a2c82b1092"
+  integrity sha512-Xgp9g+A/cG47sUyRwwYxGM4bR/jDRg5N6it/8+HxCnbT5XNKSKDT9xm4oag/osgqjC2It/vH0yXsomOG6k558g==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.22.5"
+    "@babel/helper-module-imports" "^7.22.5"
+    "@babel/plugin-syntax-jsx" "^7.22.5"
+    lodash "^4.17.21"
+    picomatch "^2.3.1"
 
 backbone@1.3.3:
   version "1.3.3"
@@ -2085,15 +2066,15 @@ browser-stdout@1.3.1:
   resolved "https://registry.yarnpkg.com/browser-stdout/-/browser-stdout-1.3.1.tgz#baa559ee14ced73452229bad7326467c61fabd60"
   integrity sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==
 
-browserslist@^4.14.5, browserslist@^4.20.2:
-  version "4.21.4"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.4.tgz#e7496bbc67b9e39dd0f98565feccdcb0d4ff6987"
-  integrity sha512-CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw==
+browserslist@^4.14.5, browserslist@^4.21.9:
+  version "4.21.10"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.10.tgz#dbbac576628c13d3b2231332cb2ec5a46e015bb0"
+  integrity sha512-bipEBdZfVH5/pwrvqc+Ub0kUPVfGUhlKxbvfD+z1BDnPEO/X98ruXGA1WP5ASpAFKan7Qr6j736IacbZQuAlKQ==
   dependencies:
-    caniuse-lite "^1.0.30001400"
-    electron-to-chromium "^1.4.251"
-    node-releases "^2.0.6"
-    update-browserslist-db "^1.0.9"
+    caniuse-lite "^1.0.30001517"
+    electron-to-chromium "^1.4.477"
+    node-releases "^2.0.13"
+    update-browserslist-db "^1.0.11"
 
 buffer-alloc-unsafe@^1.1.0:
   version "1.1.0"
@@ -2229,9 +2210,9 @@ cacheable-lookup@^5.0.3:
   integrity sha512-2/kNscPhpcxrOigMZzbiWF7dz8ilhb/nIHU3EyZiXWXpeq/au8qJ8VhdftMkty3n7Gj6HIGalQG8oiBNB3AJgA==
 
 cacheable-request@^7.0.2:
-  version "7.0.2"
-  resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-7.0.2.tgz#ea0d0b889364a25854757301ca12b2da77f91d27"
-  integrity sha512-pouW8/FmiPQbuGpkXQ9BAPv/Mo5xDGANgSNXzTzJ8DrKGuXOssM4wIQRjfanNRh3Yu5cfYPvcorqbhg2KIJtew==
+  version "7.0.4"
+  resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-7.0.4.tgz#7a33ebf08613178b403635be7b899d3e69bbe817"
+  integrity sha512-v+p6ongsrp0yTGbJXjgxPow2+DL93DASP4kXCDKb8/bwRtt9OEF3whggkkDkGNzgcWy2XaF4a8nZglC7uElscg==
   dependencies:
     clone-response "^1.0.2"
     get-stream "^5.1.0"
@@ -2260,14 +2241,14 @@ camelcase@^6.0.0, camelcase@^6.2.0:
   integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==
 
 camelize@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/camelize/-/camelize-1.0.0.tgz#164a5483e630fa4321e5af07020e531831b2609b"
-  integrity sha512-W2lPwkBkMZwFlPCXhIlYgxu+7gC/NUlCtdK652DAJ1JdgV0sTrvuPFshNPrFa1TY2JOkLhgdeEBplB4ezEa+xg==
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/camelize/-/camelize-1.0.1.tgz#89b7e16884056331a35d6b5ad064332c91daa6c3"
+  integrity sha512-dU+Tx2fsypxTgtLoE36npi3UqcjSSMNYfkqgmoEhtZrraP5VWq0K7FkWVTYa8eMPtnU/G2txVsfdCJTn9uzpuQ==
 
-caniuse-lite@^1.0.30001400:
-  version "1.0.30001436"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001436.tgz#22d7cbdbbbb60cdc4ca1030ccd6dea9f5de4848b"
-  integrity sha512-ZmWkKsnC2ifEPoWUvSAIGyOYwT+keAaaWPHiQ9DfMqS1t6tfuyFYoWR78TeZtznkEQ64+vGXH9cZrElwR2Mrxg==
+caniuse-lite@^1.0.30001517:
+  version "1.0.30001518"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001518.tgz#b3ca93904cb4699c01218246c4d77a71dbe97150"
+  integrity sha512-rup09/e3I0BKjncL+FesTayKtPrdwKhUufQFd3riFw1hHg8JmIFoInYfB102cFcY/pPgGmdyl/iy+jgiDi2vdA==
 
 chai-as-promised@^7.1.1:
   version "7.1.1"
@@ -2282,13 +2263,13 @@ chai-bytes@^0.1.2:
   integrity sha512-0ol6oJS0y1ozj6AZK8n1pyv1/G+l44nqUJygAkK1UrYl+IOGie5vcrEdrAlwmLYGIA9NVvtHWosPYwWWIXf/XA==
 
 chai@^4.3.4:
-  version "4.3.6"
-  resolved "https://registry.yarnpkg.com/chai/-/chai-4.3.6.tgz#ffe4ba2d9fa9d6680cc0b370adae709ec9011e9c"
-  integrity sha512-bbcp3YfHCUzMOvKqsztczerVgBKSsEijCySNlHHbX3VG1nskvqjz5Rfso1gGwD6w6oOV3eI60pKuMOV5MV7p3Q==
+  version "4.3.7"
+  resolved "https://registry.yarnpkg.com/chai/-/chai-4.3.7.tgz#ec63f6df01829088e8bf55fca839bcd464a8ec51"
+  integrity sha512-HLnAzZ2iupm25PlN0xFreAlBA5zaBSv3og0DdeGA4Ar6h6rJ3A0rolRUKJhSF2V10GZKDgWF/VmAEsNWjCRB+A==
   dependencies:
     assertion-error "^1.1.0"
     check-error "^1.0.2"
-    deep-eql "^3.0.1"
+    deep-eql "^4.1.2"
     get-func-name "^2.0.0"
     loupe "^2.3.1"
     pathval "^1.1.1"
@@ -2305,7 +2286,7 @@ chalk@^1.1.3:
     strip-ansi "^3.0.0"
     supports-color "^2.0.0"
 
-chalk@^2.0.0, chalk@^2.4.2:
+chalk@^2.0.0:
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
   integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
@@ -2314,7 +2295,7 @@ chalk@^2.0.0, chalk@^2.4.2:
     escape-string-regexp "^1.0.5"
     supports-color "^5.3.0"
 
-chalk@^4.0.0, chalk@^4.0.2, chalk@^4.1.0, chalk@^4.1.1:
+chalk@^4.0.0, chalk@^4.0.2, chalk@^4.1.0, chalk@^4.1.1, chalk@^4.1.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01"
   integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==
@@ -2372,10 +2353,10 @@ classnames@2.2.5:
   resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.2.5.tgz#fb3801d453467649ef3603c7d61a02bd129bde6d"
   integrity sha512-DTt3GhOUDKhh4ONwIJW4lmhyotQmV2LjNlGK/J2hkwUcqcbKkCLAdJPtxQnxnlc7SR3f1CEXCyMmc7WLUsWbNA==
 
-classnames@^2.2.5, classnames@^2.2.6:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.3.1.tgz#dfcfa3891e306ec1dad105d0e88f4417b8535e8e"
-  integrity sha512-OlQdbZ7gLfGarSqxesMesDa5uz7KFbID8Kpq/SxIoNGDqY8lSYs0D+hhtBXhcdB3rcbXArFr7vlHheLk1voeNA==
+classnames@^2.2.5:
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.3.2.tgz#351d813bf0137fcc6a76a16b88208d2560a0d924"
+  integrity sha512-CSbhY4cFEJRe6/GQzIk5qXZ4Jeg5pcsP7b5peFSDpffpe1cqjASH/n9UTjBwOp6XpMSTwQ8Za2K5V02ueA7Tmw==
 
 cli-boxes@^2.2.1:
   version "2.2.1"
@@ -2418,16 +2399,16 @@ clone-deep@^4.0.1:
     shallow-clone "^3.0.0"
 
 clone-response@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/clone-response/-/clone-response-1.0.2.tgz#d1dc973920314df67fbeb94223b4ee350239e96b"
-  integrity sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws=
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/clone-response/-/clone-response-1.0.3.tgz#af2032aa47816399cf5f0a1d0db902f517abb8c3"
+  integrity sha512-ROoL94jJH2dUVML2Y/5PEDNaSHgeOdSDicUyS7izcF63G6sTc/FTjLub4b8Il9S8S0beOfYt0TaA5qvFK+w0wA==
   dependencies:
     mimic-response "^1.0.0"
 
 clsx@^1.0.4, clsx@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/clsx/-/clsx-1.1.1.tgz#98b3134f9abbdf23b2663491ace13c5c03a73188"
-  integrity sha512-6/bPho624p3S2pMyvP5kKBPXnI3ufHLObBFCfgx+LkeR5lg2XYy2hqZqUf45ypD8COn2bhgGJSUE+l5dhNBieA==
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/clsx/-/clsx-1.2.1.tgz#0ddc4a20a549b59c93a4116bb26f5294ca17dc12"
+  integrity sha512-EcR6r5a8bj6pu3ycsa/E/cKVGuTgZJZdsyUYHOksG/UHIiKfjxzRxYJpyVBwYaQeOvghal9fcc4PidlgzugAQg==
 
 cmake-js@^7.2.1:
   version "7.2.1"
@@ -2465,7 +2446,7 @@ color-convert@^2.0.1:
 color-name@1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
-  integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=
+  integrity sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==
 
 color-name@~1.1.4:
   version "1.1.4"
@@ -2531,35 +2512,15 @@ compare-version@^0.1.2:
   resolved "https://registry.yarnpkg.com/compare-version/-/compare-version-0.1.2.tgz#0162ec2d9351f5ddd59a9202cba935366a725080"
   integrity sha512-pJDh5/4wrEnXX/VWRZvruAGHkzKdr46z11OlTPN+VrATlWWhSKewNCJ1futCO5C7eJB3nPMFZA1LeYtcFboZ2A==
 
-component-classes@^1.2.5:
-  version "1.2.6"
-  resolved "https://registry.yarnpkg.com/component-classes/-/component-classes-1.2.6.tgz#c642394c3618a4d8b0b8919efccbbd930e5cd691"
-  integrity sha1-xkI5TDYYpNiwuJGe/Mu9kw5c1pE=
-  dependencies:
-    component-indexof "0.0.3"
-
-component-indexof@0.0.3:
-  version "0.0.3"
-  resolved "https://registry.yarnpkg.com/component-indexof/-/component-indexof-0.0.3.tgz#11d091312239eb8f32c8f25ae9cb002ffe8d3c24"
-  integrity sha1-EdCRMSI5648yyPJa6csAL/6NPCQ=
-
-compress-brotli@^1.3.8:
-  version "1.3.8"
-  resolved "https://registry.yarnpkg.com/compress-brotli/-/compress-brotli-1.3.8.tgz#0c0a60c97a989145314ec381e84e26682e7b38db"
-  integrity sha512-lVcQsjhxhIXsuupfy9fmZUFtAIdBmXA7EGY6GBdgZ++qkM9zG4YFT8iU7FoBxzryNDMOpD1HIFHUSX4D87oqhQ==
-  dependencies:
-    "@types/json-buffer" "~3.0.0"
-    json-buffer "~3.0.1"
-
 concat-map@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
-  integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
+  integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==
 
 config@1.28.1:
   version "1.28.1"
   resolved "https://registry.yarnpkg.com/config/-/config-1.28.1.tgz#7625d2a1e4c90f131d8a73347982d93c3873282d"
-  integrity sha1-diXSoeTJDxMdinM0eYLZPDhzKC0=
+  integrity sha512-NT2hna+ec7G1hLB+Jimu6tuzQQqAG81YJM2P4x31hM9qffcOeaMlue6tc/TTEEfRcyzVTJFzBzweRQf0FBHghQ==
   dependencies:
     json5 "0.4.0"
     os-homedir "1.0.2"
@@ -2584,27 +2545,20 @@ confusing-browser-globals@^1.0.10:
 console-control-strings@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
-  integrity sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=
+  integrity sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==
 
 convert-source-map@^1.7.0:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.8.0.tgz#f3373c32d21b4d780dd8004514684fb791ca4369"
-  integrity sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==
-  dependencies:
-    safe-buffer "~5.1.1"
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.9.0.tgz#7faae62353fb4213366d0ca98358d22e8368b05f"
+  integrity sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==
 
 copy-to-clipboard@^3.3.1:
-  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/copy-to-clipboard/-/copy-to-clipboard-3.3.1.tgz#115aa1a9998ffab6196f93076ad6da3b913662ae"
-  integrity sha512-i13qo6kIHTTpCm8/Wup+0b1mVWETvu2kIMzKoK8FpkLkFxlt0znUAHcMzox+T8sPlqtZXq3CulEjQHsYiGFJUw==
+  version "3.3.3"
+  resolved "https://registry.yarnpkg.com/copy-to-clipboard/-/copy-to-clipboard-3.3.3.tgz#55ac43a1db8ae639a4bd99511c148cdd1b83a1b0"
+  integrity sha512-2KV8NhB5JqC3ky0r9PMCAZKbUHSwtEo4CwCs0KXgruG43gX5PMqDEBbVU4OUzw2MuAWUfsuFmWvEKG5QRfSnJA==
   dependencies:
     toggle-selection "^1.0.6"
 
-core-js@^2.4.0:
-  version "2.6.12"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.12.tgz#d9333dfa7b065e347cc5682219d6f690859cc2ec"
-  integrity sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==
-
 core-util-is@1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
@@ -2654,45 +2608,36 @@ crypto-random-string@^2.0.0:
   resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-2.0.0.tgz#ef2a7a966ec11083388369baa02ebead229b30d5"
   integrity sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA==
 
-css-animation@^1.3.2:
-  version "1.6.1"
-  resolved "https://registry.yarnpkg.com/css-animation/-/css-animation-1.6.1.tgz#162064a3b0d51f958b7ff37b3d6d4de18e17039e"
-  integrity sha512-/48+/BaEaHRY6kNQ2OIPzKf9A6g8WjZYjhiNDNuIVbsm5tXCGIAsHDjB4Xu1C4vXJtUWZo26O68OQkDpNBaPog==
-  dependencies:
-    babel-runtime "6.x"
-    component-classes "^1.2.5"
-
 css-color-keywords@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/css-color-keywords/-/css-color-keywords-1.0.0.tgz#fea2616dc676b2962686b3af8dbdbe180b244e05"
-  integrity sha1-/qJhbcZ2spYmhrOvjb2+GAskTgU=
+  integrity sha512-FyyrDHZKEjXDpNJYvVsV960FiqQyXc/LlYmsxl2BcdMb2WPx0OGRVgTg55rPSyLSNMqP52R9r8geSp7apN3Ofg==
 
-css-in-js-utils@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/css-in-js-utils/-/css-in-js-utils-2.0.1.tgz#3b472b398787291b47cfe3e44fecfdd9e914ba99"
-  integrity sha512-PJF0SpJT+WdbVVt0AOYp9C8GnuruRlL/UFW7932nLWmFLQTaWEzTBQEx7/hn4BuV+WON75iAViSUJLiU3PKbpA==
+css-in-js-utils@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/css-in-js-utils/-/css-in-js-utils-3.1.0.tgz#640ae6a33646d401fc720c54fc61c42cd76ae2bb"
+  integrity sha512-fJAcud6B3rRu+KHYk+Bwf+WFL2MDCJJ1XG9x137tJQ0xYxor7XziQtuGFbWNdqrvF4Tk26O3H73nfVqXt/fW1A==
   dependencies:
-    hyphenate-style-name "^1.0.2"
-    isobject "^3.0.1"
+    hyphenate-style-name "^1.0.3"
 
 css-loader@^6.7.2:
-  version "6.7.2"
-  resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-6.7.2.tgz#26bc22401b5921686a10fbeba75d124228302304"
-  integrity sha512-oqGbbVcBJkm8QwmnNzrFrWTnudnRZC+1eXikLJl0n4ljcfotgRifpg2a1lKy8jTrc4/d9A/ap1GFq1jDKG7J+Q==
+  version "6.8.1"
+  resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-6.8.1.tgz#0f8f52699f60f5e679eab4ec0fcd68b8e8a50a88"
+  integrity sha512-xDAXtEVGlD0gJ07iclwWVkLoZOpEvAWaSyf6W18S2pOC//K8+qUDIx8IIT3D+HjnmkJPQeesOPv5aiUaJsCM2g==
   dependencies:
     icss-utils "^5.1.0"
-    postcss "^8.4.18"
+    postcss "^8.4.21"
     postcss-modules-extract-imports "^3.0.0"
-    postcss-modules-local-by-default "^4.0.0"
+    postcss-modules-local-by-default "^4.0.3"
     postcss-modules-scope "^3.0.0"
     postcss-modules-values "^4.0.0"
     postcss-value-parser "^4.2.0"
     semver "^7.3.8"
 
 css-to-react-native@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/css-to-react-native/-/css-to-react-native-3.0.0.tgz#62dbe678072a824a689bcfee011fc96e02a7d756"
-  integrity sha512-Ro1yETZA813eoyUp2GDBhG2j+YggidUmzO1/v9eYBKR2EHVEniE2MI/NqpTQ954BMpTPZFsGNPm46qFB9dpaPQ==
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/css-to-react-native/-/css-to-react-native-3.2.0.tgz#cdd8099f71024e149e4f6fe17a7d46ecd55f1e32"
+  integrity sha512-e8RKaLXMOFii+02mOlqwjbD00KSEKqblnpO9e++1aXS1fPQOpS1YoqdVHBqPjHNoxeF2mimzVqawm2KCbEdtHQ==
   dependencies:
     camelize "^1.0.0"
     css-color-keywords "^1.0.0"
@@ -2719,9 +2664,9 @@ cssstyle@^3.0.0:
     rrweb-cssom "^0.6.0"
 
 csstype@^3.0.2, csstype@^3.0.6:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.1.0.tgz#4ddcac3718d787cf9df0d1b7d15033925c8f29f2"
-  integrity sha512-uX1KG+x9h5hIJsaKR9xHUeUraxf8IODOwq9JLNPq6BwB04a/xgpq3rcx47l5BZu5zBPlgD342tdke3Hom/nJRA==
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.1.2.tgz#1d4bf9d572f11c14031f0436e1c10bc1f571f50b"
+  integrity sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ==
 
 "curve25519-js@https://github.com/oxen-io/curve25519-js":
   version "0.0.4"
@@ -2777,12 +2722,12 @@ decompress-response@^6.0.0:
 deep-diff@^0.3.5:
   version "0.3.8"
   resolved "https://registry.yarnpkg.com/deep-diff/-/deep-diff-0.3.8.tgz#c01de63efb0eec9798801d40c7e0dae25b582c84"
-  integrity sha1-wB3mPvsO7JeYgB1Ax+Da4ltYLIQ=
+  integrity sha512-yVn6RZmHiGnxRKR9sJb3iVV2XTF1Ghh2DiWRZ3dMnGc43yUdWWF/kX6lQyk3+P84iprfWKU/8zFTrlkvtFm1ug==
 
-deep-eql@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/deep-eql/-/deep-eql-3.0.1.tgz#dfc9404400ad1c8fe023e7da1df1c147c4b444df"
-  integrity sha512-+QeIQyN5ZuO+3Uk5DYh6/1eKO0m0YmJFGNmFHGACpf1ClL1nmlV/p4gNgbl2pJGxgXb4faqo6UE+M5ACEMyVcw==
+deep-eql@^4.1.2:
+  version "4.1.3"
+  resolved "https://registry.yarnpkg.com/deep-eql/-/deep-eql-4.1.3.tgz#7c7775513092f7df98d8df9996dd085eb668cc6d"
+  integrity sha512-WaEtAOpRA1MQ0eohqZjpGD8zdI0Ovsm8mmFhaDN8dvDZzyoUMcYDnf5Y6iu7HTXxf8JDS23qWa4a+hKCDyOPzw==
   dependencies:
     type-detect "^4.0.0"
 
@@ -2817,12 +2762,12 @@ define-properties@^1.1.3, define-properties@^1.1.4, define-properties@^1.2.0:
 delayed-stream@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
-  integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk=
+  integrity sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==
 
 delegates@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
-  integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=
+  integrity sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==
 
 detect-node@^2.0.4:
   version "2.1.0"
@@ -2917,11 +2862,6 @@ doctrine@^3.0.0:
   dependencies:
     esutils "^2.0.2"
 
-dom-align@^1.7.0:
-  version "1.12.3"
-  resolved "https://registry.yarnpkg.com/dom-align/-/dom-align-1.12.3.tgz#a36d02531dae0eefa2abb0c4db6595250526f103"
-  integrity sha512-Gj9hZN3a07cbR6zviMUBOMPdWxYhbMI+x+WS0NAIu2zFZmbK8ys9R79g+iG9qLnlCwpFoaB+fKy8Pdv470GsPA==
-
 dom-helpers@^5.0.1, dom-helpers@^5.1.3:
   version "5.2.1"
   resolved "https://registry.yarnpkg.com/dom-helpers/-/dom-helpers-5.2.1.tgz#d9400536b2bf8225ad98fe052e029451ac40e902"
@@ -2938,9 +2878,9 @@ domexception@^4.0.0:
     webidl-conversions "^7.0.0"
 
 dompurify@^2.0.7:
-  version "2.3.8"
-  resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-2.3.8.tgz#224fe9ae57d7ebd9a1ae1ac18c1c1ca3f532226f"
-  integrity sha512-eVhaWoVibIzqdGYjwsBWodIQIaXFSB+cKDf4cfxLMsK0xiud6SE+/WCVx/Xw/UwQsa4cS3T2eITcdtmTg2UKcw==
+  version "2.4.7"
+  resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-2.4.7.tgz#277adeb40a2c84be2d42a8bcd45f582bfa4d0cfc"
+  integrity sha512-kxxKlPEDa6Nc5WJi+qRgPbOAbgTpSULL+vI3NUXsZMlkJxTqYI9wg5ZTay2sFrdZRWHPWNi+EdAhcJf81WtoMQ==
 
 dot-prop@^5.2.0:
   version "5.3.0"
@@ -2967,9 +2907,9 @@ dtrace-provider@~0.8:
     nan "^2.14.0"
 
 ejs@^3.1.7:
-  version "3.1.8"
-  resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.8.tgz#758d32910c78047585c7ef1f92f9ee041c1c190b"
-  integrity sha512-/sXZeMlhS0ArkfX2Aw780gJzXSMPnKjtspYZv+f3NiKLlubezAHDU5+9xz6gd3/NhG3txQCo6xlglmTS+oTGEQ==
+  version "3.1.9"
+  resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.9.tgz#03c9e8777fe12686a9effcef22303ca3d8eeb361"
+  integrity sha512-rC+QVNMJWv+MtPgkt0y+0rVEIdbtxVADApW9JXrUVlzHetgcyczP/E7DJmWJ4fJCZF2cPcBk0laWO9ZHMG3DmQ==
   dependencies:
     jake "^10.8.5"
 
@@ -2994,7 +2934,7 @@ electron-builder@23.0.8:
 electron-is-accelerator@^0.1.0:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/electron-is-accelerator/-/electron-is-accelerator-0.1.2.tgz#509e510c26a56b55e17f863a4b04e111846ab27b"
-  integrity sha1-UJ5RDCala1Xhf4Y6SwThEYRqsns=
+  integrity sha512-fLGSAjXZtdn1sbtZxx52+krefmtNuVwnJCV2gNiVt735/ARUboMl8jnNC9fZEqQdlAv2ZrETfmBUsoQci5evJA==
 
 electron-localshortcut@^3.2.1:
   version "3.2.1"
@@ -3044,10 +2984,10 @@ electron-publish@23.6.0:
     lazy-val "^1.0.5"
     mime "^2.5.2"
 
-electron-to-chromium@^1.4.251:
-  version "1.4.284"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.284.tgz#61046d1e4cab3a25238f6bf7413795270f125592"
-  integrity sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA==
+electron-to-chromium@^1.4.477:
+  version "1.4.479"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.479.tgz#ec9f676f23d3a0b0e429bc454d25e0b3253d2118"
+  integrity sha512-ABv1nHMIR8I5n3O3Een0gr6i0mfM+YcTZqjHy3pAYaOjgFG+BMquuKrSyfYf5CbEkLr9uM05RA3pOk4udNB/aQ==
 
 electron-updater@^4.2.2:
   version "4.6.5"
@@ -3063,7 +3003,16 @@ electron-updater@^4.2.2:
     lodash.isequal "^4.5.0"
     semver "^7.3.5"
 
-electron@*, electron@25.3.0:
+electron@*:
+  version "25.3.2"
+  resolved "https://registry.yarnpkg.com/electron/-/electron-25.3.2.tgz#4ca096ea85abf05cbbc42e60da9e2c3a7b87dd80"
+  integrity sha512-xiktJvXraaE/ARf2OVHFyTze1TksSbsbJgOaBtdIiBvUduez6ipATEPIec8Msz1n6eQ+xqYb6YF8tDuIZtJSPw==
+  dependencies:
+    "@electron/get" "^2.0.0"
+    "@types/node" "^18.11.18"
+    extract-zip "^2.0.1"
+
+electron@25.3.0:
   version "25.3.0"
   resolved "https://registry.yarnpkg.com/electron/-/electron-25.3.0.tgz#e818ab3ebd3e7a45f8fca0f47e607c9af2dc92c7"
   integrity sha512-cyqotxN+AroP5h2IxUsJsmehYwP5LrFAOO7O7k9tILME3Sa1/POAg3shrhx4XEnaAMyMqMLxzGvkzCVxzEErnA==
@@ -3090,7 +3039,7 @@ emojis-list@^3.0.0:
 encoding@0.1.12:
   version "0.1.12"
   resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.12.tgz#538b66f3ee62cd1ab51ec323829d1f9480c74beb"
-  integrity sha1-U4tm8+5izRq1HsMjgp0flIDHS+s=
+  integrity sha512-bl1LAgiQc4ZWr++pNYUdRe/alecaHFeHxIJ/pNciqGdKXghaTCOwKkbKp6ye7pKZGu/GcaSXFk8PBVhgs+dJdA==
   dependencies:
     iconv-lite "~0.4.13"
 
@@ -3101,10 +3050,10 @@ end-of-stream@^1.1.0:
   dependencies:
     once "^1.4.0"
 
-enhanced-resolve@^5.0.0, enhanced-resolve@^5.10.0:
-  version "5.12.0"
-  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.12.0.tgz#300e1c90228f5b570c4d35babf263f6da7155634"
-  integrity sha512-QHTXI/sZQmko1cbDoNAa3mJ5qhWUUNAq3vR0/YiD379fWQrcfuoX1+HW2S0MTt7XmoPLapdaDKUtelUSPic7hQ==
+enhanced-resolve@^5.0.0, enhanced-resolve@^5.15.0:
+  version "5.15.0"
+  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.15.0.tgz#1af946c7d93603eb88e9896cee4904dc012e9c35"
+  integrity sha512-LXYT42KJ7lpIKECr2mAXIaMldcNCh/7E0KBKOu4KSfkHmP+mZmSs+8V5gBAqisWBy0OO4W5Oyys0GO1Y8KtdKg==
   dependencies:
     graceful-fs "^4.2.4"
     tapable "^2.2.0"
@@ -3130,13 +3079,13 @@ err-code@^2.0.2:
   integrity sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==
 
 error-stack-parser@^2.0.6:
-  version "2.0.7"
-  resolved "https://registry.yarnpkg.com/error-stack-parser/-/error-stack-parser-2.0.7.tgz#b0c6e2ce27d0495cf78ad98715e0cad1219abb57"
-  integrity sha512-chLOW0ZGRf4s8raLrDxa5sdkvPec5YdvwbFnqJme4rk0rFajP8mPtrDL1+I+CwrQDCjswDA5sREX7jYQDQs9vA==
+  version "2.1.4"
+  resolved "https://registry.yarnpkg.com/error-stack-parser/-/error-stack-parser-2.1.4.tgz#229cb01cdbfa84440bfa91876285b94680188286"
+  integrity sha512-Sk5V6wVazPhq5MhpO+AUxJn5x7XSXGl1R93Vn7i+zS15KDVxQijejNCrz8340/2bgLBjR9GtEG8ZVKONDjcqGQ==
   dependencies:
-    stackframe "^1.1.1"
+    stackframe "^1.3.4"
 
-es-abstract@^1.19.0, es-abstract@^1.20.4:
+es-abstract@^1.19.0, es-abstract@^1.20.4, es-abstract@^1.21.2:
   version "1.22.1"
   resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.22.1.tgz#8b4e5fc5cefd7f1660f0f8e1a52900dfbc9d9ccc"
   integrity sha512-ioRRcXMO6OFyRpyzV3kE1IIBd4WG5/kltnzdxSCqoP8CMGs/Li+M1uF5o7lOkZVFjDs+NLesthnF66Pg/0q0Lw==
@@ -3181,10 +3130,10 @@ es-abstract@^1.19.0, es-abstract@^1.20.4:
     unbox-primitive "^1.0.2"
     which-typed-array "^1.1.10"
 
-es-module-lexer@^0.9.0:
-  version "0.9.3"
-  resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-0.9.3.tgz#6f13db00cc38417137daf74366f535c8eb438f19"
-  integrity sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ==
+es-module-lexer@^1.2.1:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-1.3.0.tgz#6be9c9e0b4543a60cd166ff6f8b4e9dae0b0c16f"
+  integrity sha512-vZK7T0N2CBmBOixhmjdqx2gWVbFZ4DXZ/NyRMZVlJXPa7CyFS+/a4QQsDGDQy9ZfEzxFuNEsMLeQJnKP2p5/JA==
 
 es-set-tostringtag@^2.0.1:
   version "2.0.1"
@@ -3234,7 +3183,7 @@ escape-string-regexp@4.0.0, escape-string-regexp@^4.0.0:
 escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
-  integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
+  integrity sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==
 
 escape-string-regexp@^2.0.0:
   version "2.0.0"
@@ -3252,9 +3201,9 @@ eslint-config-airbnb-base@^15.0.0:
     semver "^6.3.0"
 
 eslint-config-prettier@^8.8.0:
-  version "8.8.0"
-  resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.8.0.tgz#bfda738d412adc917fd7b038857110efe98c9348"
-  integrity sha512-wLbQiFre3tdGgpDv67NQKnJuTlcUVYHas3k+DZCc2U2BadthoEY4B7hLPvAxaqdyOGCzuLfii2fqGph10va7oA==
+  version "8.9.0"
+  resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.9.0.tgz#094b6254b2804b0544f7cee535f802b6d29ee10b"
+  integrity sha512-+sbni7NfVXnOpnRadUA8S28AUlsZt9GjgFvABIRL9Hkn8KqNzOp+7Lw4QWtrwn20KzU3wqu1QoOj2m+7rKRqkA==
 
 eslint-import-resolver-node@^0.3.7:
   version "0.3.7"
@@ -3265,7 +3214,7 @@ eslint-import-resolver-node@^0.3.7:
     is-core-module "^2.11.0"
     resolve "^1.22.1"
 
-eslint-module-utils@^2.7.4:
+eslint-module-utils@^2.8.0:
   version "2.8.0"
   resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.8.0.tgz#e439fee65fc33f6bba630ff621efc38ec0375c49"
   integrity sha512-aWajIYfsqCKRDgUfjEXNN/JlrzauMuSEy5sbd7WXbtW3EH6A6MpwEh42c7qD+MqQo9QMJ6fWLAeIJynx0g6OAw==
@@ -3273,25 +3222,28 @@ eslint-module-utils@^2.7.4:
     debug "^3.2.7"
 
 eslint-plugin-import@^2.27.5:
-  version "2.27.5"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.27.5.tgz#876a6d03f52608a3e5bb439c2550588e51dd6c65"
-  integrity sha512-LmEt3GVofgiGuiE+ORpnvP+kAm3h6MLZJ4Q5HCyHADofsb4VzXFsRiWj3c0OFiV+3DWFh0qg3v9gcPlfc3zRow==
+  version "2.28.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.28.0.tgz#8d66d6925117b06c4018d491ae84469eb3cb1005"
+  integrity sha512-B8s/n+ZluN7sxj9eUf7/pRFERX0r5bnFA2dCaLHy2ZeaQEAz0k+ZZkFWRFHJAqxfxQDx6KLv9LeIki7cFdwW+Q==
   dependencies:
     array-includes "^3.1.6"
+    array.prototype.findlastindex "^1.2.2"
     array.prototype.flat "^1.3.1"
     array.prototype.flatmap "^1.3.1"
     debug "^3.2.7"
     doctrine "^2.1.0"
     eslint-import-resolver-node "^0.3.7"
-    eslint-module-utils "^2.7.4"
+    eslint-module-utils "^2.8.0"
     has "^1.0.3"
-    is-core-module "^2.11.0"
+    is-core-module "^2.12.1"
     is-glob "^4.0.3"
     minimatch "^3.1.2"
+    object.fromentries "^2.0.6"
+    object.groupby "^1.0.0"
     object.values "^1.1.6"
-    resolve "^1.22.1"
-    semver "^6.3.0"
-    tsconfig-paths "^3.14.1"
+    resolve "^1.22.3"
+    semver "^6.3.1"
+    tsconfig-paths "^3.14.2"
 
 eslint-plugin-mocha@^10.1.0:
   version "10.1.0"
@@ -3312,9 +3264,9 @@ eslint-plugin-react-hooks@^4.6.0:
   integrity sha512-oFc7Itz9Qxh2x4gNHStv3BqJq54ExXmfC+a1NjAta66IAN87Wu0R/QArgIS9qKzX3dXKPI9H5crl9QchNMY9+g==
 
 eslint-plugin-react@^7.33.0:
-  version "7.33.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.33.0.tgz#6c356fb0862fec2cd1b04426c669ea746e9b6eb3"
-  integrity sha512-qewL/8P34WkY8jAqdQxsiL82pDUeT7nhs8IsuXgfgnsEloKCT4miAV9N9kGtx7/KM9NH/NCGUE7Edt9iGxLXFw==
+  version "7.33.1"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.33.1.tgz#bc27cccf860ae45413a4a4150bf0977345c1ceab"
+  integrity sha512-L093k0WAMvr6VhNwReB8VgOq5s2LesZmrpPdKz/kZElQDzqS7G7+DnKoqT+w4JwuiGeAhAvHO0fvy0Eyk4ejDA==
   dependencies:
     array-includes "^3.1.6"
     array.prototype.flatmap "^1.3.1"
@@ -3340,10 +3292,10 @@ eslint-scope@5.1.1:
     esrecurse "^4.3.0"
     estraverse "^4.1.1"
 
-eslint-scope@^7.2.0:
-  version "7.2.1"
-  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.2.1.tgz#936821d3462675f25a18ac5fd88a67cc15b393bd"
-  integrity sha512-CvefSOsDdaYYvxChovdrPo/ZGt8d5lrJWleAc1diXRKhHGiTYEI26cvo8Kle/wGnsizoCJjK73FMg1/IkIwiNA==
+eslint-scope@^7.2.2:
+  version "7.2.2"
+  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.2.2.tgz#deb4f92563390f32006894af62a22dba1c46423f"
+  integrity sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==
   dependencies:
     esrecurse "^4.3.0"
     estraverse "^5.2.0"
@@ -3360,32 +3312,32 @@ eslint-visitor-keys@^2.0.0:
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303"
   integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==
 
-eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.1:
-  version "3.4.1"
-  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.1.tgz#c22c48f48942d08ca824cc526211ae400478a994"
-  integrity sha512-pZnmmLwYzf+kWaM/Qgrvpen51upAktaaiI01nsJD/Yr3lMOdNtq0cxkrrg16w64VtisN6okbs7Q8AfGqj4c9fA==
+eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.1, eslint-visitor-keys@^3.4.2:
+  version "3.4.2"
+  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.2.tgz#8c2095440eca8c933bedcadf16fefa44dbe9ba5f"
+  integrity sha512-8drBzUEyZ2llkpCA67iYrgEssKDUu68V8ChqqOfFupIaG/LCVPUT+CoGJpT77zJprs4T/W7p07LP7zAIMuweVw==
 
 eslint@^8.45.0:
-  version "8.45.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.45.0.tgz#bab660f90d18e1364352c0a6b7c6db8edb458b78"
-  integrity sha512-pd8KSxiQpdYRfYa9Wufvdoct3ZPQQuVuU5O6scNgMuOMYuxvH0IGaYK0wUFjo4UYYQQCUndlXiMbnxopwvvTiw==
+  version "8.46.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.46.0.tgz#a06a0ff6974e53e643acc42d1dcf2e7f797b3552"
+  integrity sha512-cIO74PvbW0qU8e0mIvk5IV3ToWdCq5FYG6gWPHHkx6gNdjlbAYvtfHmlCMXxjcoVaIdwy/IAt3+mDkZkfvb2Dg==
   dependencies:
     "@eslint-community/eslint-utils" "^4.2.0"
-    "@eslint-community/regexpp" "^4.4.0"
-    "@eslint/eslintrc" "^2.1.0"
-    "@eslint/js" "8.44.0"
+    "@eslint-community/regexpp" "^4.6.1"
+    "@eslint/eslintrc" "^2.1.1"
+    "@eslint/js" "^8.46.0"
     "@humanwhocodes/config-array" "^0.11.10"
     "@humanwhocodes/module-importer" "^1.0.1"
     "@nodelib/fs.walk" "^1.2.8"
-    ajv "^6.10.0"
+    ajv "^6.12.4"
     chalk "^4.0.0"
     cross-spawn "^7.0.2"
     debug "^4.3.2"
     doctrine "^3.0.0"
     escape-string-regexp "^4.0.0"
-    eslint-scope "^7.2.0"
-    eslint-visitor-keys "^3.4.1"
-    espree "^9.6.0"
+    eslint-scope "^7.2.2"
+    eslint-visitor-keys "^3.4.2"
+    espree "^9.6.1"
     esquery "^1.4.2"
     esutils "^2.0.2"
     fast-deep-equal "^3.1.3"
@@ -3408,7 +3360,7 @@ eslint@^8.45.0:
     strip-ansi "^6.0.1"
     text-table "^0.2.0"
 
-espree@^9.6.0:
+espree@^9.6.0, espree@^9.6.1:
   version "9.6.1"
   resolved "https://registry.yarnpkg.com/espree/-/espree-9.6.1.tgz#a2a17b8e434690a5432f2f8018ce71d331a48c6f"
   integrity sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==
@@ -3505,9 +3457,9 @@ fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:
   integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
 
 fast-glob@^3.2.9:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.3.0.tgz#7c40cb491e1e2ed5664749e87bfb516dbe8727c0"
-  integrity sha512-ChDuvbOypPuNjO8yIDf36x7BlZX1smcUMTTcyoIjycexOxd6DFsKsg21qVBzEmr3G7fUKIRy2/psii+CIUt7FA==
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.3.1.tgz#784b4e897340f3dbbef17413b3f11acf03c874c4"
+  integrity sha512-kNFPyjhh5cKjrUltxs+wFx+ZkbRaxxmZ+X0ZU31SOsxCEtP9VPgtq2teZw1DebupL5GmDaNQ6yKMMVcM41iqDg==
   dependencies:
     "@nodelib/fs.stat" "^2.0.2"
     "@nodelib/fs.walk" "^1.2.3"
@@ -3523,7 +3475,12 @@ fast-json-stable-stringify@^2.0.0:
 fast-levenshtein@^2.0.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
-  integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=
+  integrity sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==
+
+fast-loops@^1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/fast-loops/-/fast-loops-1.1.3.tgz#ce96adb86d07e7bf9b4822ab9c6fac9964981f75"
+  integrity sha512-8EZzEP0eKkEEVX+drtd9mtuQ+/QrlfW/5MlwcwK5Nds6EkZ/tRzEexkzUY2mIssnAyVLT+TKHuRXmFNNXYUd6g==
 
 fast-shallow-equal@^1.0.0:
   version "1.0.0"
@@ -3550,14 +3507,14 @@ fastq@^1.6.0:
 fd-slicer@~1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.1.0.tgz#25c7c89cb1f9077f8891bbe61d8f390eae256f1e"
-  integrity sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4=
+  integrity sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==
   dependencies:
     pend "~1.2.0"
 
 fetch@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/fetch/-/fetch-1.1.0.tgz#0a8279f06be37f9f0ebb567560a30a480da59a2e"
-  integrity sha1-CoJ58Gvjf58Ou1Z1YKMKSA2lmi4=
+  integrity sha512-5O8TwrGzoNblBG/jtK4NFuZwNCkZX6s5GfRNOaGtm+QGJEuNakSC/i2RW0R93KX6E0jVjNXm6O3CRN4Ql3K+yA==
   dependencies:
     biskviit "1.0.1"
     encoding "0.1.12"
@@ -3579,7 +3536,7 @@ file-uri-to-path@1.0.0:
   resolved "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz#553a7b8446ff6f684359c445f1e37a05dacc33dd"
   integrity sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==
 
-filelist@^1.0.1:
+filelist@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/filelist/-/filelist-1.0.4.tgz#f78978a1e944775ff9e62e744424f215e58352b5"
   integrity sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q==
@@ -3624,7 +3581,7 @@ find-yarn-workspace-root@^2.0.0:
 firstline@1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/firstline/-/firstline-1.2.1.tgz#b88673c42009f8821fac2926e99720acee924fae"
-  integrity sha1-uIZzxCAJ+IIfrCkm6ZcgrO6ST64=
+  integrity sha512-6eMQNJtDzyXSC1yeCBWspqA6LeV5la2XHGTXQq4O0xkglAutpyny/sB+zVdXTZ9nzcDW9ZGLxwXXkB+ZEtJuPw==
 
 flat-cache@^3.0.4:
   version "3.0.4"
@@ -3640,9 +3597,9 @@ flat@^5.0.2:
   integrity sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==
 
 flatted@^3.1.0:
-  version "3.2.5"
-  resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.5.tgz#76c8584f4fc843db64702a6bd04ab7a8bd666da3"
-  integrity sha512-WIWGi2L3DyTUvUrwRKgGi9TwxQMUEqPOPQBVi71R96jZXJdFskXEmf54BoZaS1kknGODoIGASGEzBUYdyMCBJg==
+  version "3.2.7"
+  resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.7.tgz#609f39207cb614b89d0765b477cb2d437fbf9787"
+  integrity sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==
 
 follow-redirects@^1.15.0:
   version "1.15.2"
@@ -3693,15 +3650,6 @@ fs-extra@^10.0.0, fs-extra@^10.1.0:
     jsonfile "^6.0.1"
     universalify "^2.0.0"
 
-fs-extra@^7.0.1:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.1.tgz#4f189c44aa123b895f722804f55ea23eadc348e9"
-  integrity sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==
-  dependencies:
-    graceful-fs "^4.1.2"
-    jsonfile "^4.0.0"
-    universalify "^0.1.0"
-
 fs-extra@^8.1.0:
   version "8.1.0"
   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0"
@@ -3731,7 +3679,7 @@ fs-minipass@^2.0.0:
 fs.realpath@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
-  integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
+  integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==
 
 fsevents@~2.3.2:
   version "2.3.2"
@@ -3785,7 +3733,7 @@ get-caller-file@^2.0.5:
 get-func-name@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/get-func-name/-/get-func-name-2.0.0.tgz#ead774abee72e20409433a066366023dd6887a41"
-  integrity sha1-6td0q+5y4gQJQzoGY2YCPdaIekE=
+  integrity sha512-Hm0ixYtaSZ/V7C8FJrtZIuBBI+iSgL+1Aq82zSu8VQNB4S3Gk8e7Qs3VwBDJAhmRZcFqkl3tQu36g/Foh5I5ig==
 
 get-intrinsic@^1.0.2, get-intrinsic@^1.1.1, get-intrinsic@^1.1.3, get-intrinsic@^1.2.0, get-intrinsic@^1.2.1:
   version "1.2.1"
@@ -3856,7 +3804,7 @@ glob@7.2.0:
 glob@^6.0.1:
   version "6.0.4"
   resolved "https://registry.yarnpkg.com/glob/-/glob-6.0.4.tgz#0f08860f6a155127b2fadd4f9ce24b1aab6e4d22"
-  integrity sha1-DwiGD2oVUSey+t1PnOJLGqtuTSI=
+  integrity sha512-MKZeRNyYZAVVVG1oZeLaWie1uweH40m9AZwIwxyPbTSX4hHrVYSzLg0Ro5Z5R7XKkIX+Cc6oD1rqeDJnwsB8/A==
   dependencies:
     inflight "^1.0.4"
     inherits "2"
@@ -3934,9 +3882,9 @@ gopd@^1.0.1:
     get-intrinsic "^1.1.3"
 
 got@^11.8.5, got@^9.6.0:
-  version "11.8.5"
-  resolved "https://registry.yarnpkg.com/got/-/got-11.8.5.tgz#ce77d045136de56e8f024bebb82ea349bc730046"
-  integrity sha512-o0Je4NvQObAuZPHLFoRSkdG2lTgtcynqymzg2Vupdx6PorhaT5MCbIyXG6d4D94kk8ZG57QeosgdiqfJWhEhlQ==
+  version "11.8.6"
+  resolved "https://registry.yarnpkg.com/got/-/got-11.8.6.tgz#276e827ead8772eddbcfc97170590b841823233a"
+  integrity sha512-6tfZ91bOr7bOXnK7PRDCGBLa1H4U080YHNaAQ2KsMGlLEzRbk44nsZF2E1IeRc3vtJHPVbKCYgdFbaGO2ljd8g==
   dependencies:
     "@sindresorhus/is" "^4.0.0"
     "@szmarczak/http-timer" "^4.0.5"
@@ -3951,9 +3899,9 @@ got@^11.8.5, got@^9.6.0:
     responselike "^2.0.0"
 
 graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4, graceful-fs@^4.2.9:
-  version "4.2.10"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c"
-  integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==
+  version "4.2.11"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3"
+  integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==
 
 "graceful-readlink@>= 1.0.0":
   version "1.0.1"
@@ -3968,7 +3916,7 @@ graphemer@^1.4.0:
 has-ansi@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91"
-  integrity sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=
+  integrity sha512-C8vBJ8DwUCx19vhm7urhTuUsr4/IyP6l4VzNQDv+ryHQObW3TTTp9yB68WpYgRe2bbaGuZ/se74IqFeVnMnLZg==
   dependencies:
     ansi-regex "^2.0.0"
 
@@ -3980,7 +3928,7 @@ has-bigints@^1.0.1, has-bigints@^1.0.2:
 has-flag@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
-  integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0=
+  integrity sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==
 
 has-flag@^4.0.0:
   version "4.0.0"
@@ -4014,7 +3962,7 @@ has-tostringtag@^1.0.0:
 has-unicode@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
-  integrity sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=
+  integrity sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==
 
 has-yarn@^2.1.0:
   version "2.1.0"
@@ -4089,7 +4037,7 @@ human-signals@^1.1.1:
   resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-1.1.1.tgz#c5b1cd14f50aeae09ab6c59fe63ba3395fe4dfa3"
   integrity sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==
 
-hyphenate-style-name@^1.0.2:
+hyphenate-style-name@^1.0.3:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/hyphenate-style-name/-/hyphenate-style-name-1.0.4.tgz#691879af8e220aea5750e8827db4ef62a54e361d"
   integrity sha512-ygGZLjmXfPHj+ZWh6LwbC37l43MhfztxetbFCoYTM2VjkIUpeHgSNn7QIyVFj7YQ1Wl9Cbw5sholVJPzWvC2MQ==
@@ -4139,14 +4087,14 @@ image-type@^4.1.0:
     file-type "^10.10.0"
 
 immer@^9.0.7:
-  version "9.0.14"
-  resolved "https://registry.yarnpkg.com/immer/-/immer-9.0.14.tgz#e05b83b63999d26382bb71676c9d827831248a48"
-  integrity sha512-ubBeqQutOSLIFCUBN03jGeOS6a3DoYlSYwYJTa+gSKEZKU5redJIqkIdZ3JVv/4RZpfcXdAWH5zCNLWPRv2WDw==
+  version "9.0.21"
+  resolved "https://registry.yarnpkg.com/immer/-/immer-9.0.21.tgz#1e025ea31a40f24fb064f1fef23e931496330176"
+  integrity sha512-bc4NBHqOqSfRW7POMkHd51LvClaeMXpm8dx0e8oE2GORbq5aRK7Bxl4FyzVLdGtLmvLKL7BTDBG5ACQm4HWjTA==
 
 immutable@^4.0.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/immutable/-/immutable-4.1.0.tgz#f795787f0db780183307b9eb2091fcac1f6fafef"
-  integrity sha512-oNkuqVTA8jqG1Q6c+UglTOD1xhC1BtjKI7XkCXRkZHrN5m18/XsnUp8Q89GkQO/z+0WjonSvl0FLhDYftp46nQ==
+  version "4.3.1"
+  resolved "https://registry.yarnpkg.com/immutable/-/immutable-4.3.1.tgz#17988b356097ab0719e2f741d56f3ec6c317f9dc"
+  integrity sha512-lj9cnmB/kVS0QHsJnYKD1uo3o39nrbKxszjnqS9Fr6NB7bZzW45U6WSGBPKXDL/CvDKqDNPA4r3DoDQ8GTxo2A==
 
 import-fresh@^3.2.1:
   version "3.3.0"
@@ -4172,12 +4120,12 @@ import-local@^3.0.2:
 imurmurhash@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
-  integrity sha1-khi5srkoojixPcT7a21XbyMUU+o=
+  integrity sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==
 
 inflight@^1.0.4:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
-  integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=
+  integrity sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==
   dependencies:
     once "^1.3.0"
     wrappy "1"
@@ -4193,11 +4141,12 @@ ini@2.0.0, ini@^1.3.6, ini@~1.3.0:
   integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==
 
 inline-style-prefixer@^6.0.0:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/inline-style-prefixer/-/inline-style-prefixer-6.0.1.tgz#c5c0e43ba8831707afc5f5bbfd97edf45c1fa7ae"
-  integrity sha512-AsqazZ8KcRzJ9YPN1wMH2aNM7lkWQ8tSPrW5uDk1ziYwiAPWSZnUsC7lfZq+BDqLqz0B4Pho5wscWcJzVvRzDQ==
+  version "6.0.4"
+  resolved "https://registry.yarnpkg.com/inline-style-prefixer/-/inline-style-prefixer-6.0.4.tgz#4290ed453ab0e4441583284ad86e41ad88384f44"
+  integrity sha512-FwXmZC2zbeeS7NzGjJ6pAiqRhXR0ugUShSNb6GApMl6da0/XGc4MOJsoWAywia52EEWbXNSy0pzkwz/+Y+swSg==
   dependencies:
-    css-in-js-utils "^2.0.0"
+    css-in-js-utils "^3.1.0"
+    fast-loops "^1.1.3"
 
 internal-slot@^1.0.3, internal-slot@^1.0.5:
   version "1.0.5"
@@ -4232,10 +4181,10 @@ ip2country@1.0.1:
   dependencies:
     asbycountry "^1.4.2"
 
-ip@^1.1.5:
-  version "1.1.8"
-  resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.8.tgz#ae05948f6b075435ed3307acce04629da8cdbf48"
-  integrity sha512-PuExPYUiu6qMBQb4l06ecm6T6ujzhmh+MeJcW9wa89PoAz5pvd4zPgN5WJV104mb6S2T1AwNIAaB70JNrLQWhg==
+ip@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/ip/-/ip-2.0.0.tgz#4cf4ab182fee2314c75ede1276f8c80b479936da"
+  integrity sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ==
 
 is-array-buffer@^3.0.1, is-array-buffer@^3.0.2:
   version "3.0.2"
@@ -4287,7 +4236,7 @@ is-ci@^3.0.0:
   dependencies:
     ci-info "^3.2.0"
 
-is-core-module@^2.11.0, is-core-module@^2.9.0:
+is-core-module@^2.11.0, is-core-module@^2.12.0, is-core-module@^2.12.1, is-core-module@^2.9.0:
   version "2.12.1"
   resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.12.1.tgz#0c0b6885b6f80011c71541ce15c8d66cf5a4f9fd"
   integrity sha512-Q4ZuBAe2FUsKtyQJoQHlvP8OvBERxO3jEmy1I7hcRXcJBGGHFh/aJBswbXuS9sgrDH2QUO8ilkwNPHvHMd8clg==
@@ -4309,7 +4258,7 @@ is-docker@^2.0.0, is-docker@^2.1.1:
 is-extglob@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
-  integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=
+  integrity sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==
 
 is-fullwidth-code-point@^3.0.0:
   version "3.0.0"
@@ -4424,7 +4373,7 @@ is-typed-array@^1.1.10, is-typed-array@^1.1.9:
 is-typedarray@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
-  integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=
+  integrity sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==
 
 is-unicode-supported@^0.1.0:
   version "0.1.0"
@@ -4453,7 +4402,7 @@ is-yarn-global@^0.3.0:
 isarray@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
-  integrity sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=
+  integrity sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==
 
 isarray@^2.0.5:
   version "2.0.5"
@@ -4475,22 +4424,22 @@ isbinaryfile@^4.0.10:
 isexe@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
-  integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=
+  integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==
 
 isobject@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
-  integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8=
+  integrity sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==
 
 jake@^10.8.5:
-  version "10.8.5"
-  resolved "https://registry.yarnpkg.com/jake/-/jake-10.8.5.tgz#f2183d2c59382cb274226034543b9c03b8164c46"
-  integrity sha512-sVpxYeuAhWt0OTWITwT98oyV0GsXyMlXCF+3L1SuafBVUIr/uILGRB+NqwkzhgXKvoJpDIpQvqkUALgdmQsQxw==
+  version "10.8.7"
+  resolved "https://registry.yarnpkg.com/jake/-/jake-10.8.7.tgz#63a32821177940c33f356e0ba44ff9d34e1c7d8f"
+  integrity sha512-ZDi3aP+fG/LchyBzUM804VjddnwfSfsdeYkwt8NcbKRvo4rFkjhs456iLFn3k2ZUWvNe4i48WACDbza8fhq2+w==
   dependencies:
     async "^3.2.3"
     chalk "^4.0.2"
-    filelist "^1.0.1"
-    minimatch "^3.0.4"
+    filelist "^1.0.4"
+    minimatch "^3.1.2"
 
 jest-diff@^27.2.5, jest-diff@^27.5.1:
   version "27.5.1"
@@ -4581,7 +4530,7 @@ js-yaml@4.1.0, js-yaml@^4.1.0:
 jsdom-global@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/jsdom-global/-/jsdom-global-3.0.2.tgz#6bd299c13b0c4626b2da2c0393cd4385d606acb9"
-  integrity sha1-a9KZwTsMRiay2iwDk81DhdYGrLk=
+  integrity sha512-t1KMcBkz/pT5JrvcJbpUR2u/w1kO9jXctaaGJ0vZDzwFnIvGWw9IDSRciT83kIs8Bnw4qpOl8bQK08V01YgMPg==
 
 jsdom@^22.1.0:
   version "22.1.0"
@@ -4617,7 +4566,7 @@ jsesc@^2.5.1:
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4"
   integrity sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==
 
-json-buffer@3.0.1, json-buffer@~3.0.1:
+json-buffer@3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.1.tgz#9338802a30d3b6605fbe0613e094008ca8c05a13"
   integrity sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==
@@ -4640,14 +4589,14 @@ json-schema-traverse@^1.0.0:
 json-stable-stringify-without-jsonify@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651"
-  integrity sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=
+  integrity sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==
 
 json-stringify-safe@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
   integrity sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==
 
-json5@0.4.0, json5@^1.0.1, json5@^2.1.2, json5@^2.2.0, json5@^2.2.1, json5@^2.2.2:
+json5@0.4.0, json5@^1.0.2, json5@^2.1.2, json5@^2.2.0, json5@^2.2.2:
   version "2.2.3"
   resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283"
   integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==
@@ -4655,7 +4604,7 @@ json5@0.4.0, json5@^1.0.1, json5@^2.1.2, json5@^2.2.0, json5@^2.2.1, json5@^2.2.
 jsonfile@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb"
-  integrity sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=
+  integrity sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==
   optionalDependencies:
     graceful-fs "^4.1.6"
 
@@ -4669,9 +4618,9 @@ jsonfile@^6.0.1:
     graceful-fs "^4.1.6"
 
 "jsx-ast-utils@^2.4.1 || ^3.0.0":
-  version "3.3.4"
-  resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-3.3.4.tgz#b896535fed5b867650acce5a9bd4135ffc7b3bf9"
-  integrity sha512-fX2TVdCViod6HwKEtSWGHs57oFhVfCMwieb9PuRDgjDPh5XeqJiHFFFJCHxU5cnTc3Bu/GRL+kPiFmw8XWOfKw==
+  version "3.3.5"
+  resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-3.3.5.tgz#4766bd05a8e2a11af222becd19e15575e52a853a"
+  integrity sha512-ZZow9HBI5O6EPgSJLUb8n2NKgmVWTwCvHGwFuJlMjvLFqlGG6pjirPhtdsseaLZjSibD8eegzmYpUZwoIlj2cQ==
   dependencies:
     array-includes "^3.1.6"
     array.prototype.flat "^1.3.1"
@@ -4694,11 +4643,10 @@ keyboardevents-areequal@^0.2.1:
   integrity sha512-Nv+Kr33T0mEjxR500q+I6IWisOQ0lK1GGOncV0kWE6n4KFmpcu7RUX5/2B0EUtX51Cb0HjZ9VJsSY3u4cBa0kw==
 
 keyv@^4.0.0:
-  version "4.3.3"
-  resolved "https://registry.yarnpkg.com/keyv/-/keyv-4.3.3.tgz#6c1bcda6353a9e96fc1b4e1aeb803a6e35090ba9"
-  integrity sha512-AcysI17RvakTh8ir03+a3zJr5r0ovnAH/XTXei/4HIv3bL2K/jzvgivLK9UuI/JbU1aJjM3NSAnVvVVd3n+4DQ==
+  version "4.5.3"
+  resolved "https://registry.yarnpkg.com/keyv/-/keyv-4.5.3.tgz#00873d2b046df737963157bd04f294ca818c9c25"
+  integrity sha512-QCiSav9WaX1PgETJ+SpNnx2PRRapJ/oRSXM4VO5OGYGSjrxbKPVFVhB3l2OCbLCk329N8qyAtsJjSjvVBWzEug==
   dependencies:
-    compress-brotli "^1.3.8"
     json-buffer "3.0.1"
 
 kind-of@^6.0.2:
@@ -4713,11 +4661,6 @@ klaw-sync@^6.0.0:
   dependencies:
     graceful-fs "^4.1.11"
 
-klona@^2.0.6:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/klona/-/klona-2.0.6.tgz#85bffbf819c03b2f53270412420a4555ef882e22"
-  integrity sha512-dhG34DXATL5hSxJbIexCft8FChFXtmskoZYnoPWjXQuebWYCNkVeV3KkGegCK9CP1oswI/vQibS2GY7Em/sJJA==
-
 lamejs@^1.2.0:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/lamejs/-/lamejs-1.2.1.tgz#0f92d38729213f106d4a19ded20821da7e89c8e4"
@@ -4759,17 +4702,17 @@ levn@^0.4.1:
     cmake-js "^7.2.1"
     node-addon-api "^6.1.0"
 
-libsodium-sumo@^0.7.0:
-  version "0.7.10"
-  resolved "https://registry.yarnpkg.com/libsodium-sumo/-/libsodium-sumo-0.7.10.tgz#169756dbf32088f42e30dfb0a7860074663fb0b4"
-  integrity sha512-xvYHwrTPvw9EFvX77x6gFiB7vdTv4+9xpM5DCkg9FJwysHoBO7sYXxXjy5L2gQSuWaINbtjBUry9eCg/+nYwCA==
+libsodium-sumo@^0.7.11:
+  version "0.7.11"
+  resolved "https://registry.yarnpkg.com/libsodium-sumo/-/libsodium-sumo-0.7.11.tgz#ab0389e2424fca5c1dc8c4fd394906190da88a11"
+  integrity sha512-bY+7ph7xpk51Ez2GbE10lXAQ5sJma6NghcIDaSPbM/G9elfrjLa0COHl/7P6Wb/JizQzl5UQontOOP1z0VwbLA==
 
 libsodium-wrappers-sumo@^0.7.9:
-  version "0.7.10"
-  resolved "https://registry.yarnpkg.com/libsodium-wrappers-sumo/-/libsodium-wrappers-sumo-0.7.10.tgz#592b0cc714ddf3954f93e2292ff3aadebd2b282b"
-  integrity sha512-1noz8Mcl/LUzO/iSO/FJzoJyIaPwxl+/+E4CoTIXtsPiEEXQx2sxalmrVWxteLpynqgX0ASo28ChB9NEVRh0Pg==
+  version "0.7.11"
+  resolved "https://registry.yarnpkg.com/libsodium-wrappers-sumo/-/libsodium-wrappers-sumo-0.7.11.tgz#d96329ee3c0e7ec7f5fcf4cdde16cc3a1ae91d82"
+  integrity sha512-DGypHOmJbB1nZn89KIfGOAkDgfv5N6SBGC3Qvmy/On0P0WD1JQvNRS/e3UL3aFF+xC0m+MYz5M+MnRnK2HMrKQ==
   dependencies:
-    libsodium-sumo "^0.7.0"
+    libsodium-sumo "^0.7.11"
 
 linkify-it@^4.0.1:
   version "4.0.1"
@@ -4814,17 +4757,17 @@ lodash-es@^4.2.1:
 lodash.escaperegexp@^4.1.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/lodash.escaperegexp/-/lodash.escaperegexp-4.1.2.tgz#64762c48618082518ac3df4ccf5d5886dae20347"
-  integrity sha1-ZHYsSGGAglGKw99Mz11YhtriA0c=
+  integrity sha512-TM9YBvyC84ZxE3rgfefxUWiQKLilstD6k7PTGt6wfbtXF8ixIJLOL3VYyV/z+ZiPLsVxAsKAFVwWlWeb2Y8Yyw==
 
 lodash.get@^4.4.2:
   version "4.4.2"
   resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99"
-  integrity sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=
+  integrity sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==
 
 lodash.isequal@^4.5.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0"
-  integrity sha1-QVxEePK8wwEgwizhDtMib30+GOA=
+  integrity sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==
 
 lodash.isplainobject@^4.0.6:
   version "4.0.6"
@@ -4836,7 +4779,7 @@ lodash.merge@^4.6.2:
   resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a"
   integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==
 
-lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.2.1:
+lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.2.1:
   version "4.17.21"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
@@ -4857,7 +4800,7 @@ long@^4.0.0:
 long@~3:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/long/-/long-3.2.0.tgz#d821b7138ca1cb581c172990ef14db200b5c474b"
-  integrity sha1-2CG3E4yhy1gcFymQ7xTbIAtcR0s=
+  integrity sha512-ZYvPPOMqUwPoDsbJaR10iQJYnMuZhRTvHYl62ErLIEX7RgFlziSBUUvrt3OVfc47QlHHpzPZYP17g3Fv7oeJkg==
 
 loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.4.0:
   version "1.4.0"
@@ -4867,9 +4810,9 @@ loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.4.0:
     js-tokens "^3.0.0 || ^4.0.0"
 
 loupe@^2.3.1:
-  version "2.3.4"
-  resolved "https://registry.yarnpkg.com/loupe/-/loupe-2.3.4.tgz#7e0b9bffc76f148f9be769cb1321d3dcf3cb25f3"
-  integrity sha512-OvKfgCC2Ndby6aSTREl5aCCPTNIzlDfQZvZxNUrBrihDhL3xcrYegTblhmEiCrg2kKQz4XsFIaemE5BF4ybSaQ==
+  version "2.3.6"
+  resolved "https://registry.yarnpkg.com/loupe/-/loupe-2.3.6.tgz#76e4af498103c532d1ecc9be102036a21f787b53"
+  integrity sha512-RaPMZKiMy8/JruncMU5Bt6na1eftNoo++R4Y+N2FrxkDVTrGvcyzFTsaGif4QTeKESheMGegbhw6iUAq+5A8zA==
   dependencies:
     get-func-name "^2.0.0"
 
@@ -4878,6 +4821,13 @@ lowercase-keys@^2.0.0:
   resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-2.0.0.tgz#2603e78b7b4b0006cbca2fbcc8a3202558ac9479"
   integrity sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==
 
+lru-cache@^5.1.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-5.1.1.tgz#1da27e6710271947695daf6848e847f01d84b920"
+  integrity sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==
+  dependencies:
+    yallist "^3.0.2"
+
 lru-cache@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94"
@@ -4985,9 +4935,9 @@ mimic-response@^3.1.0:
   integrity sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==
 
 mini-css-extract-plugin@^2.7.5:
-  version "2.7.5"
-  resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-2.7.5.tgz#afbb344977659ec0f1f6e050c7aea456b121cfc5"
-  integrity sha512-9HaR++0mlgom81s95vvNjxkg52n2b5s//3ZTI1EtzFb98awsLSivs2LMsVqnQ3ay0PVhqWcGNyDaTE961FOcjQ==
+  version "2.7.6"
+  resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-2.7.6.tgz#282a3d38863fddcd2e0c220aaed5b90bc156564d"
+  integrity sha512-Qk7HcgaPkGG6eD77mLvZS1nmxlao3j+9PkrT9Uc7HAE1id3F41+DdBRYRYkbyfNRGzm8/YWtzhw7nVPmwhqTQw==
   dependencies:
     schema-utils "^4.0.0"
 
@@ -4999,17 +4949,22 @@ mini-css-extract-plugin@^2.7.5:
     brace-expansion "^1.1.7"
 
 minimist@^1.2.0, minimist@^1.2.6:
-  version "1.2.6"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44"
-  integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==
+  version "1.2.8"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c"
+  integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==
 
 minipass@^3.0.0:
-  version "3.1.6"
-  resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.1.6.tgz#3b8150aa688a711a1521af5e8779c1d3bb4f45ee"
-  integrity sha512-rty5kpw9/z8SX9dmxblFA6edItUmwJgMeYDZRrwlIVN27i8gysGbznJwUggw2V/FVqFSDdWy040ZPS811DYAqQ==
+  version "3.3.6"
+  resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.3.6.tgz#7bba384db3a1520d18c9c0e5251c3444e95dd94a"
+  integrity sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==
   dependencies:
     yallist "^4.0.0"
 
+minipass@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/minipass/-/minipass-5.0.0.tgz#3e9788ffb90b694a5d0ec94479a45b5d8738133d"
+  integrity sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==
+
 minizlib@^2.1.1:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931"
@@ -5066,7 +5021,7 @@ moment@^2.19.3, moment@^2.29.4:
 ms@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
-  integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=
+  integrity sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==
 
 ms@2.1.2:
   version "2.1.2"
@@ -5081,7 +5036,7 @@ ms@2.1.3, ms@^2.1.1, ms@^2.1.2:
 mv@~2:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/mv/-/mv-2.1.1.tgz#ae6ce0d6f6d5e0a4f7d893798d03c1ea9559b6a2"
-  integrity sha1-rmzg1vbV4KT32JN5jQPB6pVZtqI=
+  integrity sha512-at/ZndSy3xEGJ8i0ygALh8ru9qy7gWW1cmkaqBN29JmMlIvM//MEO9y1sk/avxuwnPcfhkejkLsuPxH81BrkSg==
   dependencies:
     mkdirp "~0.5.1"
     ncp "~2.0.0"
@@ -5111,10 +5066,10 @@ nanoid@3.3.3:
   resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.3.tgz#fd8e8b7aa761fe807dba2d1b98fb7241bb724a25"
   integrity sha512-p1sjXuopFs0xg+fPASzQ28agW1oHD7xDsd9Xkf3T15H3c/cifrFHVwrh74PdoklAPi+i7MdRsE47vm2r6JoB+w==
 
-nanoid@^3.3.4:
-  version "3.3.4"
-  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.4.tgz#730b67e3cd09e2deacf03c027c81c9d9dbc5e8ab"
-  integrity sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==
+nanoid@^3.3.6:
+  version "3.3.6"
+  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.6.tgz#443380c856d6e9f9824267d960b4236ad583ea4c"
+  integrity sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==
 
 natural-compare-lite@^1.4.0:
   version "1.4.0"
@@ -5124,12 +5079,12 @@ natural-compare-lite@^1.4.0:
 natural-compare@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
-  integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=
+  integrity sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==
 
 ncp@~2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ncp/-/ncp-2.0.0.tgz#195a21d6c46e361d2fb1281ba38b91e9df7bdbb3"
-  integrity sha1-GVoh1sRuNh0vsSgbo4uR6d9727M=
+  integrity sha512-zIdGUrPRFTUELUvr3Gmc7KZ2Sw/h1PiVM0Af/oHB6zgnV1ikqSfRk+TOufi79aHYCW3NiOXmr1BP5nWbzojLaA==
 
 neo-async@^2.6.2:
   version "2.6.2"
@@ -5168,9 +5123,9 @@ node-api-headers@^0.0.2:
   integrity sha512-YsjmaKGPDkmhoNKIpkChtCsPVaRE0a274IdERKnuc/E8K1UJdBZ4/mvI006OijlQZHCfpRNOH3dfHQs92se8gg==
 
 node-fetch@^2.6.7:
-  version "2.6.7"
-  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.7.tgz#24de9fba827e3b4ae44dc8b20256a379160052ad"
-  integrity sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==
+  version "2.6.12"
+  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.12.tgz#02eb8e22074018e3d5a83016649d04df0e348fba"
+  integrity sha512-C/fGU2E8ToujUivIO0H+tpQ6HWo4eEmchoPIoXtxCrVghxdKq+QOHqEZW7tuP3KlV3bC8FRMO5nMCC7Zm1VP6g==
   dependencies:
     whatwg-url "^5.0.0"
 
@@ -5181,10 +5136,10 @@ node-loader@^2.0.0:
   dependencies:
     loader-utils "^2.0.0"
 
-node-releases@^2.0.6:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.6.tgz#8a7088c63a55e493845683ebf3c828d8c51c5503"
-  integrity sha512-PiVXnNuFm5+iYkLBNeq5211hvO38y63T0i2KKh2KnUs3RpzJ+JtODFjkD8yjLwnDkTYF1eKXheUwdssR+NRZdg==
+node-releases@^2.0.13:
+  version "2.0.13"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.13.tgz#d5ed1627c23e3461e819b02e57b75e4899b1c81d"
+  integrity sha512-uYr7J37ae/ORWdZeQ1xxMJe3NtdmqMC/JZK+geofDrkLUApKRHPd18/TxtBOJ4A0/+uUIliorNrfYV6s1b02eQ==
 
 normalize-path@^3.0.0, normalize-path@~3.0.0:
   version "3.0.0"
@@ -5218,10 +5173,10 @@ nwsapi@^2.2.4:
   resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.7.tgz#738e0707d3128cb750dddcfe90e4610482df0f30"
   integrity sha512-ub5E4+FBPKwAZx0UwIQOjYWGHTEq5sPqHQNRN8Z9e4A7u3Tj1weLJsL59yH9vmvqEtBHaOmT6cYQKIZOxp35FQ==
 
-object-assign@4.x, object-assign@^4.1.1:
+object-assign@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
-  integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=
+  integrity sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==
 
 object-inspect@^1.12.3, object-inspect@^1.9.0:
   version "1.12.3"
@@ -5233,7 +5188,7 @@ object-keys@^1.1.1:
   resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
   integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
 
-object.assign@^4.1.0, object.assign@^4.1.2, object.assign@^4.1.4:
+object.assign@^4.1.2, object.assign@^4.1.4:
   version "4.1.4"
   resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.4.tgz#9673c7c7c351ab8c4d0b516f4343ebf4dfb7799f"
   integrity sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==
@@ -5261,6 +5216,16 @@ object.fromentries@^2.0.6:
     define-properties "^1.1.4"
     es-abstract "^1.20.4"
 
+object.groupby@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/object.groupby/-/object.groupby-1.0.0.tgz#cb29259cf90f37e7bac6437686c1ea8c916d12a9"
+  integrity sha512-70MWG6NfRH9GnbZOikuhPPYzpUpof9iW2J9E4dW7FXTqPNb6rllE6u39SKwwiNh8lCwX3DDb5OgcKGiEBrTTyw==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.2.0"
+    es-abstract "^1.21.2"
+    get-intrinsic "^1.2.1"
+
 object.hasown@^1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/object.hasown/-/object.hasown-1.1.2.tgz#f919e21fad4eb38a57bc6345b3afd496515c3f92"
@@ -5281,7 +5246,7 @@ object.values@^1.1.6:
 once@^1.3.0, once@^1.3.1, once@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
-  integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
+  integrity sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==
   dependencies:
     wrappy "1"
 
@@ -5301,9 +5266,9 @@ open@^7.4.2:
     is-wsl "^2.1.1"
 
 open@^8.3.0:
-  version "8.4.0"
-  resolved "https://registry.yarnpkg.com/open/-/open-8.4.0.tgz#345321ae18f8138f82565a910fdc6b39e8c244f8"
-  integrity sha512-XgFPPM+B28FtCCgSb9I+s9szOC1vZRSwgWsRUA5ylIxRTgKozqjOCrVOqGsYABPYK5qnfqClxZTFBa8PKt2v6Q==
+  version "8.4.2"
+  resolved "https://registry.yarnpkg.com/open/-/open-8.4.2.tgz#5b5ffe2a8f793dcd2aad73e550cb87b59cb084f9"
+  integrity sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ==
   dependencies:
     define-lazy-prop "^2.0.0"
     is-docker "^2.1.1"
@@ -5324,7 +5289,7 @@ optionator@^0.9.3:
 os-homedir@1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
-  integrity sha1-/7xJiDNuDoM94MFox+8VISGqf7M=
+  integrity sha512-B5JU3cabzk8c67mRRd3ECmROafjYMXbuzlwtqdM8IbS8ktlTix8aFGb2bAGKrSRIlnfKwovGUUr72JUPyOb6kQ==
 
 os-locale@5.0.0:
   version "5.0.0"
@@ -5338,7 +5303,7 @@ os-locale@5.0.0:
 os-tmpdir@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
-  integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=
+  integrity sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==
 
 p-cancelable@^2.0.0:
   version "2.1.1"
@@ -5348,7 +5313,7 @@ p-cancelable@^2.0.0:
 p-defer@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/p-defer/-/p-defer-1.0.0.tgz#9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c"
-  integrity sha1-n26xgvbJqozXQwBKfU+WsZaw+ww=
+  integrity sha512-wB3wfAxZpk2AzOfUMJNL+d36xothRSyj8EXOa4f6GMqYDN9BJaaSISbsk+wS9abmnebVw95C2Kb5t85UmpCxuw==
 
 p-is-promise@^2.1.0:
   version "2.1.0"
@@ -5421,23 +5386,24 @@ parse5@^7.1.2:
     entities "^4.4.0"
 
 patch-package@^6.4.7:
-  version "6.4.7"
-  resolved "https://registry.yarnpkg.com/patch-package/-/patch-package-6.4.7.tgz#2282d53c397909a0d9ef92dae3fdeb558382b148"
-  integrity sha512-S0vh/ZEafZ17hbhgqdnpunKDfzHQibQizx9g8yEf5dcVk3KOflOfdufRXQX8CSEkyOQwuM/bNz1GwKvFj54kaQ==
+  version "6.5.1"
+  resolved "https://registry.yarnpkg.com/patch-package/-/patch-package-6.5.1.tgz#3e5d00c16997e6160291fee06a521c42ac99b621"
+  integrity sha512-I/4Zsalfhc6bphmJTlrLoOcAF87jcxko4q0qsv4bGcurbr8IskEOtdnt9iCmsQVGL1B+iUhSQqweyTLJfCF9rA==
   dependencies:
     "@yarnpkg/lockfile" "^1.1.0"
-    chalk "^2.4.2"
+    chalk "^4.1.2"
     cross-spawn "^6.0.5"
     find-yarn-workspace-root "^2.0.0"
-    fs-extra "^7.0.1"
+    fs-extra "^9.0.0"
     is-ci "^2.0.0"
     klaw-sync "^6.0.0"
-    minimist "^1.2.0"
+    minimist "^1.2.6"
     open "^7.4.2"
     rimraf "^2.6.3"
     semver "^5.6.0"
     slash "^2.0.0"
     tmp "^0.0.33"
+    yaml "^1.10.2"
 
 path-exists@^4.0.0:
   version "4.0.0"
@@ -5447,12 +5413,12 @@ path-exists@^4.0.0:
 path-is-absolute@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
-  integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
+  integrity sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==
 
 path-key@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
-  integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=
+  integrity sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw==
 
 path-key@^3.0.0, path-key@^3.1.0:
   version "3.1.1"
@@ -5484,19 +5450,14 @@ pathval@^1.1.1:
 pend@~1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50"
-  integrity sha1-elfrVQpng/kRUzH89GY9XI4AelA=
-
-performance-now@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
-  integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=
+  integrity sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==
 
 picocolors@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c"
   integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==
 
-picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.3.0, picomatch@^2.3.1:
+picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.3.1:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42"
   integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
@@ -5504,12 +5465,12 @@ picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.3.0, picomatch@^2.3.1:
 pify@3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"
-  integrity sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=
+  integrity sha512-C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg==
 
 pirates@^4.0.1:
-  version "4.0.5"
-  resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.5.tgz#feec352ea5c3268fb23a37c702ab1699f35a5f3b"
-  integrity sha512-8V9+HQPupnaXMA23c5hvl69zXvTwTzyAYasnkb0Tts4XvO4CliqONMOnvlq26rkhLC3nWDFBJf73LU1e1VZLaQ==
+  version "4.0.6"
+  resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.6.tgz#3018ae32ecfcff6c29ba2267cbf21166ac1f36b9"
+  integrity sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==
 
 pixelmatch@^5.2.1:
   version "5.3.0"
@@ -5555,10 +5516,11 @@ playwright@1.16.3:
     playwright-core "=1.16.3"
 
 plist@^3.0.1, plist@^3.0.4:
-  version "3.0.6"
-  resolved "https://registry.yarnpkg.com/plist/-/plist-3.0.6.tgz#7cfb68a856a7834bca6dbfe3218eb9c7740145d3"
-  integrity sha512-WiIVYyrp8TD4w8yCvyeIr+lkmrGRd5u0VbRnU+tP/aRLxP/YadJUYOMZJ/6hIa3oUyVCsycXvtNRgd5XBJIbiA==
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/plist/-/plist-3.1.0.tgz#797a516a93e62f5bde55e0b9cc9c967f860893c9"
+  integrity sha512-uysumyrvkUX0rX/dEVqt8gC3sTBzd4zoWfLeS29nb53imdaXVvLINYXTI2GNqzaMuvacNx4uJQ8+b3zXR0pkgQ==
   dependencies:
+    "@xmldom/xmldom" "^0.8.8"
     base64-js "^1.5.1"
     xmlbuilder "^15.1.1"
 
@@ -5577,10 +5539,10 @@ postcss-modules-extract-imports@^3.0.0:
   resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz#cda1f047c0ae80c97dbe28c3e76a43b88025741d"
   integrity sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==
 
-postcss-modules-local-by-default@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.0.tgz#ebbb54fae1598eecfdf691a02b3ff3b390a5a51c"
-  integrity sha512-sT7ihtmGSF9yhm6ggikHdV0hlziDTX7oFoXtuVWeDd3hHObNkcHRo9V3yg7vCAY7cONyxJC/XXCmmiHHcvX7bQ==
+postcss-modules-local-by-default@^4.0.3:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.3.tgz#b08eb4f083050708998ba2c6061b50c2870ca524"
+  integrity sha512-2/u2zraspoACtrbFRnTijMiQtb4GW4BvatjaG/bCjYQo8kLTdevCUlwuBHx2sCnSyrI3x3qj4ZK1j5LQBgzmwA==
   dependencies:
     icss-utils "^5.0.0"
     postcss-selector-parser "^6.0.2"
@@ -5601,9 +5563,9 @@ postcss-modules-values@^4.0.0:
     icss-utils "^5.0.0"
 
 postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4:
-  version "6.0.11"
-  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.11.tgz#2e41dc39b7ad74046e1615185185cd0b17d0c8dc"
-  integrity sha512-zbARubNdogI9j7WY4nQJBiNqQf3sLS3wCP4WfOidu+p28LofJqDH1tcXypGrcmMHhDk2t9wGhCsYe/+szLTy1g==
+  version "6.0.13"
+  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.13.tgz#d05d8d76b1e8e173257ef9d60b706a8e5e99bf1b"
+  integrity sha512-EaV1Gl4mUEV4ddhDnv/xtj7sxwrwxdetHdWUGnT4VJQf+4d05v6lHYZr8N573k5Z0BViss7BDhfWtKS3+sfAqQ==
   dependencies:
     cssesc "^3.0.0"
     util-deprecate "^1.0.2"
@@ -5613,12 +5575,12 @@ postcss-value-parser@^4.0.2, postcss-value-parser@^4.1.0, postcss-value-parser@^
   resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz#723c09920836ba6d3e5af019f92bc0971c02e514"
   integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==
 
-postcss@^8.4.18:
-  version "8.4.19"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.19.tgz#61178e2add236b17351897c8bcc0b4c8ecab56fc"
-  integrity sha512-h+pbPsyhlYj6N2ozBmHhHrs9DzGmbaarbLvWipMRO7RLS+v4onj26MPFXA5OBYFxyqYhUJK456SwDcY9H2/zsA==
+postcss@^8.4.21:
+  version "8.4.27"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.27.tgz#234d7e4b72e34ba5a92c29636734349e0d9c3057"
+  integrity sha512-gY/ACJtJPSmUFPDCHtX78+01fHa64FaU4zaaWfuh1MhGJISufJAH4cun6k/8fwsHYeK4UQmENQK+tRLCFJE8JQ==
   dependencies:
-    nanoid "^3.3.4"
+    nanoid "^3.3.6"
     picocolors "^1.0.0"
     source-map-js "^1.0.2"
 
@@ -5659,7 +5621,7 @@ promise-retry@^2.0.1:
     err-code "^2.0.2"
     retry "^0.12.0"
 
-prop-types@15.x, prop-types@^15.5.10, prop-types@^15.5.4, prop-types@^15.5.8, prop-types@^15.6.2, prop-types@^15.7.2, prop-types@^15.8.1:
+prop-types@^15.5.8, prop-types@^15.6.2, prop-types@^15.7.2, prop-types@^15.8.1:
   version "15.8.1"
   resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.8.1.tgz#67d87bf1a694f48435cf332c24af10214a3140b5"
   integrity sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==
@@ -5729,7 +5691,7 @@ pupa@^2.1.1:
 qr.js@0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/qr.js/-/qr.js-0.0.0.tgz#cace86386f59a0db8050fa90d9b6b0e88a1e364f"
-  integrity sha1-ys6GOG9ZoNuAUPqQ2baw6IoeNk8=
+  integrity sha512-c4iYnWb+k2E+vYpRimHqSu575b1/wKl4XFeJGpFmrJQz5I88v9aY2czh7s0w36srfCM1sXgC/xpoJz5dJfq+OQ==
 
 querystringify@^2.1.1:
   version "2.2.0"
@@ -5746,13 +5708,6 @@ quick-lru@^5.1.1:
   resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-5.1.1.tgz#366493e6b3e42a3a6885e2e99d18f80fb7a8c932"
   integrity sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==
 
-raf@^3.4.0:
-  version "3.4.1"
-  resolved "https://registry.yarnpkg.com/raf/-/raf-3.4.1.tgz#0742e99a4a6552f445d73e3ee0328af0ff1ede39"
-  integrity sha512-Sq4CW4QhwOHE8ucn6J34MqtZCeWFP2aQSmrlroYgqAV1PjStIhJXxYuTgUIfkEk7zTLjmIjLmU5q+fbD1NnOJA==
-  dependencies:
-    performance-now "^2.1.0"
-
 rambda@^7.1.0:
   version "7.5.0"
   resolved "https://registry.yarnpkg.com/rambda/-/rambda-7.5.0.tgz#1865044c59bc0b16f63026c6e5a97e4b1bbe98fe"
@@ -5765,75 +5720,22 @@ randombytes@^2.1.0:
   dependencies:
     safe-buffer "^5.1.0"
 
-rc-align@^2.4.0:
-  version "2.4.5"
-  resolved "https://registry.yarnpkg.com/rc-align/-/rc-align-2.4.5.tgz#c941a586f59d1017f23a428f0b468663fb7102ab"
-  integrity sha512-nv9wYUYdfyfK+qskThf4BQUSIadeI/dCsfaMZfNEoxm9HwOIioQ+LyqmMK6jWHAZQgOzMLaqawhuBXlF63vgjw==
-  dependencies:
-    babel-runtime "^6.26.0"
-    dom-align "^1.7.0"
-    prop-types "^15.5.8"
-    rc-util "^4.0.4"
-
-rc-animate@2.x:
-  version "2.11.1"
-  resolved "https://registry.yarnpkg.com/rc-animate/-/rc-animate-2.11.1.tgz#2666eeb6f1f2a495a13b2af09e236712278fdb2c"
-  integrity sha512-1NyuCGFJG/0Y+9RKh5y/i/AalUCA51opyyS/jO2seELpgymZm2u9QV3xwODwEuzkmeQ1BDPxMLmYLcTJedPlkQ==
-  dependencies:
-    babel-runtime "6.x"
-    classnames "^2.2.6"
-    css-animation "^1.3.2"
-    prop-types "15.x"
-    raf "^3.4.0"
-    rc-util "^4.15.3"
-    react-lifecycles-compat "^3.0.4"
-
-rc-slider@^8.7.1:
-  version "8.7.1"
-  resolved "https://registry.yarnpkg.com/rc-slider/-/rc-slider-8.7.1.tgz#9ed07362dc93489a38e654b21b8122ad70fd3c42"
-  integrity sha512-WMT5mRFUEcrLWwTxsyS8jYmlaMsTVCZIGENLikHsNv+tE8ThU2lCoPfi/xFNUfJFNFSBFP3MwPez9ZsJmNp13g==
+rc-slider@^10.2.1:
+  version "10.2.1"
+  resolved "https://registry.yarnpkg.com/rc-slider/-/rc-slider-10.2.1.tgz#9b571d19f740adcacdde271f44901a47717fd8da"
+  integrity sha512-l355C/65iV4UFp7mXq5xBTNX2/tF2g74VWiTVlTpNp+6vjE/xaHHNiQq5Af+Uu28uUiqCuH/QXs5HfADL9KJ/A==
   dependencies:
-    babel-runtime "6.x"
+    "@babel/runtime" "^7.10.1"
     classnames "^2.2.5"
-    prop-types "^15.5.4"
-    rc-tooltip "^3.7.0"
-    rc-util "^4.0.4"
-    react-lifecycles-compat "^3.0.4"
-    shallowequal "^1.1.0"
-    warning "^4.0.3"
+    rc-util "^5.27.0"
 
-rc-tooltip@^3.7.0:
-  version "3.7.3"
-  resolved "https://registry.yarnpkg.com/rc-tooltip/-/rc-tooltip-3.7.3.tgz#280aec6afcaa44e8dff0480fbaff9e87fc00aecc"
-  integrity sha512-dE2ibukxxkrde7wH9W8ozHKUO4aQnPZ6qBHtrTH9LoO836PjDdiaWO73fgPB05VfJs9FbZdmGPVEbXCeOP99Ww==
+rc-util@^5.27.0:
+  version "5.35.0"
+  resolved "https://registry.yarnpkg.com/rc-util/-/rc-util-5.35.0.tgz#bed1986248b7be525cc0894109e609ac60207f29"
+  integrity sha512-MTXlixb3EoSTEchsOc7XWsVyoUQqoCsh2Z1a2IptwNgqleMF6ZgQeY52UzUbNj5CcVBg9YljOWjuOV07jSSm4Q==
   dependencies:
-    babel-runtime "6.x"
-    prop-types "^15.5.8"
-    rc-trigger "^2.2.2"
-
-rc-trigger@^2.2.2:
-  version "2.6.5"
-  resolved "https://registry.yarnpkg.com/rc-trigger/-/rc-trigger-2.6.5.tgz#140a857cf28bd0fa01b9aecb1e26a50a700e9885"
-  integrity sha512-m6Cts9hLeZWsTvWnuMm7oElhf+03GOjOLfTuU0QmdB9ZrW7jR2IpI5rpNM7i9MvAAlMAmTx5Zr7g3uu/aMvZAw==
-  dependencies:
-    babel-runtime "6.x"
-    classnames "^2.2.6"
-    prop-types "15.x"
-    rc-align "^2.4.0"
-    rc-animate "2.x"
-    rc-util "^4.4.0"
-    react-lifecycles-compat "^3.0.4"
-
-rc-util@^4.0.4, rc-util@^4.15.3, rc-util@^4.4.0:
-  version "4.21.1"
-  resolved "https://registry.yarnpkg.com/rc-util/-/rc-util-4.21.1.tgz#88602d0c3185020aa1053d9a1e70eac161becb05"
-  integrity sha512-Z+vlkSQVc1l8O2UjR3WQ+XdWlhj5q9BMQNLk2iOBch75CqPfrJyGtcWMcnhRlNuDu0Ndtt4kLVO8JI8BrABobg==
-  dependencies:
-    add-dom-event-listener "^1.1.0"
-    prop-types "^15.5.10"
+    "@babel/runtime" "^7.18.3"
     react-is "^16.12.0"
-    react-lifecycles-compat "^3.0.4"
-    shallowequal "^1.1.0"
 
 rc@1.2.8, rc@^1.2.7, rc@^1.2.8:
   version "1.2.8"
@@ -5870,9 +5772,9 @@ react-draggable@^4.4.4:
     prop-types "^15.8.1"
 
 react-h5-audio-player@^3.2.0:
-  version "3.8.4"
-  resolved "https://registry.yarnpkg.com/react-h5-audio-player/-/react-h5-audio-player-3.8.4.tgz#94ac1934f4e045bcd973fe09ffc318fd2c610fd1"
-  integrity sha512-SgJFuaQ0KAbPBORGGuGg3UtuffZYOcsgs/AYZOF4xTS63+n81ge/Prp2Ai+MDA/Yr0FJ7eeUB4uF1XcjKJ8xeA==
+  version "3.8.6"
+  resolved "https://registry.yarnpkg.com/react-h5-audio-player/-/react-h5-audio-player-3.8.6.tgz#e7ee69ba6c0a82d317d4f987d83bb18b356a4415"
+  integrity sha512-eyViI47jRRybCcCkGdoAMd6yfhg3UMyXp39mqOWCbNQfAYI8U6zC0+0DLZjhrB7//DJtHhZx8h1q99HMxYkMWQ==
   dependencies:
     "@babel/runtime" "^7.10.2"
     "@iconify/icons-mdi" "~1.1.0"
@@ -5904,9 +5806,9 @@ react-lifecycles-compat@^3.0.4:
   integrity sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA==
 
 react-mentions@^4.4.9:
-  version "4.4.9"
-  resolved "https://registry.yarnpkg.com/react-mentions/-/react-mentions-4.4.9.tgz#5f68c7978c107518646c5c34c47515c30259e23a"
-  integrity sha512-CUDt8GOVbAmo3o+a8l1UxcJ/gJMdFdqeiJM3U5+krcNoUwyKv7Zcy67WfFZQJfChpJ8LTiD0FtCSRoyEzC6Ysw==
+  version "4.4.10"
+  resolved "https://registry.yarnpkg.com/react-mentions/-/react-mentions-4.4.10.tgz#ae6c1e310a405597e83ce786f12c5bfb93b097ce"
+  integrity sha512-JHiQlgF1oSZR7VYPjq32wy97z1w1oE4x10EuhKjPr4WUKhVzG1uFQhQjKqjQkbVqJrmahf+ldgBTv36NrkpKpA==
   dependencies:
     "@babel/runtime" "7.4.5"
     invariant "^2.2.4"
@@ -5943,9 +5845,9 @@ react-toastify@^6.0.9:
     react-transition-group "^4.4.1"
 
 react-transition-group@^4.4.1:
-  version "4.4.2"
-  resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-4.4.2.tgz#8b59a56f09ced7b55cbd53c36768b922890d5470"
-  integrity sha512-/RNYfRAMlZwDSr6z4zNKV6xu53/e2BuaBbGhbyYIXTrmgu/bGHzmqOs7mJSJBHy9Ud+ApHx3QjrkKSp1pxvlFg==
+  version "4.4.5"
+  resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-4.4.5.tgz#e53d4e3f3344da8521489fbef8f2581d42becdd1"
+  integrity sha512-pZcd1MCJoiKiBR2NRxeCRg13uCXbydPnmB4EOeRrY7480qNWO8IIgQG6zlDkm6uRMsURXPuKq0GWtiM59a5Q6g==
   dependencies:
     "@babel/runtime" "^7.5.5"
     dom-helpers "^5.0.1"
@@ -5957,7 +5859,7 @@ react-universal-interface@^0.6.2:
   resolved "https://registry.yarnpkg.com/react-universal-interface/-/react-universal-interface-0.6.2.tgz#5e8d438a01729a4dbbcbeeceb0b86be146fe2b3b"
   integrity sha512-dg8yXdcQmvgR13RIlZbTRQOoUrDciFVoSBZILwjE2LFISxZZ8loVJKAkuzswl5js8BHda79bIb2b84ehU8IjXw==
 
-react-use@^17.2.1:
+react-use@^17.4.0:
   version "17.4.0"
   resolved "https://registry.yarnpkg.com/react-use/-/react-use-17.4.0.tgz#cefef258b0a6c534a5c8021c2528ac6e1a4cdc6d"
   integrity sha512-TgbNTCA33Wl7xzIJegn1HndB4qTS9u03QUwyNycUnXaweZkE4Kq2SB+Yoxx8qbshkZGYBDvUXbXWRUmQDcZZ/Q==
@@ -5977,10 +5879,10 @@ react-use@^17.2.1:
     ts-easing "^0.2.0"
     tslib "^2.1.0"
 
-react-virtualized@9.22.3:
-  version "9.22.3"
-  resolved "https://registry.yarnpkg.com/react-virtualized/-/react-virtualized-9.22.3.tgz#f430f16beb0a42db420dbd4d340403c0de334421"
-  integrity sha512-MKovKMxWTcwPSxE1kK1HcheQTWfuCxAuBoSTf2gwyMM21NdX/PXUhnoP8Uc5dRKd+nKm8v41R36OellhdCpkrw==
+react-virtualized@^9.22.4:
+  version "9.22.5"
+  resolved "https://registry.yarnpkg.com/react-virtualized/-/react-virtualized-9.22.5.tgz#bfb96fed519de378b50d8c0064b92994b3b91620"
+  integrity sha512-YqQMRzlVANBv1L/7r63OHa2b0ZsAaDp1UhVNEdUaXI8A5u6hTpA5NYtUueLH2rFuY/27mTGIBl7ZhqFKzw18YQ==
   dependencies:
     "@babel/runtime" "^7.7.2"
     clsx "^1.0.4"
@@ -6039,7 +5941,7 @@ rechoir@^0.8.0:
 redux-logger@3.0.6:
   version "3.0.6"
   resolved "https://registry.yarnpkg.com/redux-logger/-/redux-logger-3.0.6.tgz#f7555966f3098f3c88604c449cf0baf5778274bf"
-  integrity sha1-91VZZvMJjzyIYExEnPC69XeCdL8=
+  integrity sha512-JoCIok7bg/XpqA1JqCqXFypuqBbQzGQySrhFzewB7ThcnysTO30l4VCst86AuB9T9tuT03MAA56Jw2PNhRSNCg==
   dependencies:
     deep-diff "^0.3.5"
 
@@ -6049,16 +5951,16 @@ redux-persist@^6.0.0:
   integrity sha512-71LLMbUq2r02ng2We9S215LtPu3fY0KgaGE0k8WRgl6RkqxtGfl7HUozz1Dftwsb0D/5mZ8dwAaPbtnzfvbEwQ==
 
 redux-promise-middleware@^6.1.2:
-  version "6.1.2"
-  resolved "https://registry.yarnpkg.com/redux-promise-middleware/-/redux-promise-middleware-6.1.2.tgz#1c14222686934be243cbb292e348ef7d5b20d6d2"
-  integrity sha512-ZqZu/nnSzGgwTtNbGoGVontpk7LjTOv0kigtt3CcgXI9gpq+8WlfXTXRZD0WTD5yaohRq0q2nYmJXSTjwXs83Q==
+  version "6.1.3"
+  resolved "https://registry.yarnpkg.com/redux-promise-middleware/-/redux-promise-middleware-6.1.3.tgz#315f6a9fcabe1f02a9c2f30fa615f838d7b01b66"
+  integrity sha512-B/Hi5Ct5d9y5d/KG0f6MZUXKA0nrQh5583mHCx13HY3Avte8KfpoRH/TB5QT6k/FcjT6JCxjv7jedymidy2A1A==
 
 redux-thunk@^2.4.1:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/redux-thunk/-/redux-thunk-2.4.1.tgz#0dd8042cf47868f4b29699941de03c9301a75714"
-  integrity sha512-OOYGNY5Jy2TWvTL1KgAlVy6dcx3siPJ1wTq741EPyUKfn6W6nChdICjZwCd0p8AZBs5kWpZlbkXW2nE/zjUa+Q==
+  version "2.4.2"
+  resolved "https://registry.yarnpkg.com/redux-thunk/-/redux-thunk-2.4.2.tgz#b9d05d11994b99f7a91ea223e8b04cf0afa5ef3b"
+  integrity sha512-+P3TjtnP0k/FEjcBL5FZpoovtvrTNT/UXd4/sluaSyrURlSlhLSzEdfsTBW7WsKB6yPvgd7q/iZPICFjW4o57Q==
 
-redux@4.2.0, redux@^4.0.0, redux@^4.1.2:
+redux@4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/redux/-/redux-4.2.0.tgz#46f10d6e29b6666df758780437651eeb2b969f13"
   integrity sha512-oSBmcKKIuIR4ME29/AeNUnl5L+hvBq7OaJWzaptTQJAntaPvxIJqfnjbaEiCzzaIz+XmVILfqAM3Ob0aXLPfjA==
@@ -6075,10 +5977,12 @@ redux@^3.6.0:
     loose-envify "^1.1.0"
     symbol-observable "^1.0.3"
 
-regenerator-runtime@^0.11.0:
-  version "0.11.1"
-  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9"
-  integrity sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==
+redux@^4.0.0, redux@^4.1.2:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/redux/-/redux-4.2.1.tgz#c08f4306826c49b5e9dc901dee0452ea8fce6197"
+  integrity sha512-LAUYz4lc+Do8/g7aeRa8JkyDErK6ekstQaqWQrNRW//MY1TvCEpMtpTWvlQ+FPbWCx+Xixu/6SHt5N0HR+SB4w==
+  dependencies:
+    "@babel/runtime" "^7.9.2"
 
 regenerator-runtime@^0.13.11, regenerator-runtime@^0.13.2:
   version "0.13.11"
@@ -6111,7 +6015,7 @@ registry-url@^5.0.0:
 require-directory@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
-  integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I=
+  integrity sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==
 
 require-from-string@^2.0.2:
   version "2.0.2"
@@ -6124,9 +6028,9 @@ requires-port@^1.0.0:
   integrity sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==
 
 reselect@^4.1.5:
-  version "4.1.5"
-  resolved "https://registry.yarnpkg.com/reselect/-/reselect-4.1.5.tgz#852c361247198da6756d07d9296c2b51eddb79f6"
-  integrity sha512-uVdlz8J7OO+ASpBYoz1Zypgx0KasCY20H+N8JD13oUMtPvSHQuscrHop4KbXrbsBcdB9Ds7lVK7eRkBIfO43vQ==
+  version "4.1.8"
+  resolved "https://registry.yarnpkg.com/reselect/-/reselect-4.1.8.tgz#3f5dc671ea168dccdeb3e141236f69f02eaec524"
+  integrity sha512-ab9EmR80F/zQTMNeneUr4cv+jSwPJgIlvEmVwLerwrWVbpLlBuls9XHzIeTFy4cegU2NHBp3va0LKOzU5qFEYQ==
 
 resize-observer-polyfill@^1.5.1:
   version "1.5.1"
@@ -6155,12 +6059,12 @@ resolve-from@^5.0.0:
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69"
   integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==
 
-resolve@^1.20.0, resolve@^1.22.1:
-  version "1.22.2"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.2.tgz#0ed0943d4e301867955766c9f3e1ae6d01c6845f"
-  integrity sha512-Sb+mjNHOULsBv818T40qSPeRiuWLyaGMa5ewydRLFimneixmVy2zdivRl+AF6jaYPC8ERxGDmFSiqui6SfPd+g==
+resolve@^1.20.0, resolve@^1.22.1, resolve@^1.22.3:
+  version "1.22.3"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.3.tgz#4b4055349ffb962600972da1fdc33c46a4eb3283"
+  integrity sha512-P8ur/gp/AmbEzjr729bZnLjXK5Z+4P0zhIJgBgzqRih7hL7BOukHGtSTA3ACMY467GRFz3duQsi0bDZdR7DKdw==
   dependencies:
-    is-core-module "^2.11.0"
+    is-core-module "^2.12.0"
     path-parse "^1.0.7"
     supports-preserve-symlinks-flag "^1.0.0"
 
@@ -6183,7 +6087,7 @@ responselike@^2.0.0:
 retry@^0.12.0:
   version "0.12.0"
   resolved "https://registry.yarnpkg.com/retry/-/retry-0.12.0.tgz#1b42a6266a21f07421d1b0b54b7dc167b01c013b"
-  integrity sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs=
+  integrity sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==
 
 retry@^0.13.1:
   version "0.13.1"
@@ -6219,7 +6123,7 @@ rimraf@^3.0.0, rimraf@^3.0.2:
 rimraf@~2.4.0:
   version "2.4.5"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.4.5.tgz#ee710ce5d93a8fdb856fb5ea8ff0e2d75934b2da"
-  integrity sha1-7nEM5dk6j9uFb7Xqj/Di11k0sto=
+  integrity sha512-J5xnxTyqaiw06JjMftq7L9ouA448dw/E7dKghkP9WpKNuwmARNNg+Gk8/u5ryb9N/Yo2+z3MCwuqFK/+qPOPfQ==
   dependencies:
     glob "^6.0.1"
 
@@ -6241,9 +6145,9 @@ rrweb-cssom@^0.6.0:
   integrity sha512-APM0Gt1KoXBz0iIkkdB/kfvGOwC4UuJFeG/c+yV7wSc7q96cG/kJ0HiYCnzivD9SB53cLV1MlHFNfOuPaadYSw==
 
 rtl-css-js@^1.14.0:
-  version "1.15.0"
-  resolved "https://registry.yarnpkg.com/rtl-css-js/-/rtl-css-js-1.15.0.tgz#680ed816e570a9ebccba9e1cd0f202c6a8bb2dc0"
-  integrity sha512-99Cu4wNNIhrI10xxUaABHsdDqzalrSRTie4GeCmbGVuehm4oj+fIy8fTzB+16pmKe8Bv9rl+hxIBez6KxExTew==
+  version "1.16.1"
+  resolved "https://registry.yarnpkg.com/rtl-css-js/-/rtl-css-js-1.16.1.tgz#4b48b4354b0ff917a30488d95100fbf7219a3e80"
+  integrity sha512-lRQgou1mu19e+Ya0LsTvKrVJ5TYUbqCVPAiImX3UfLTenarvPUl1QFdvu5Z3PYmHT9RCcwIfbjRQBntExyj3Zg==
   dependencies:
     "@babel/runtime" "^7.1.2"
 
@@ -6274,11 +6178,6 @@ safe-buffer@^5.1.0, safe-buffer@~5.2.0:
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
   integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
 
-safe-buffer@~5.1.1:
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
-  integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
-
 safe-json-stringify@~1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/safe-json-stringify/-/safe-json-stringify-1.2.0.tgz#356e44bc98f1f93ce45df14bcd7c01cda86e0afd"
@@ -6311,17 +6210,16 @@ sanitize.css@^12.0.1:
   integrity sha512-QbusSBnWHaRBZeTxsJyknwI0q+q6m1NtLBmB76JfW/rdVN7Ws6Zz70w65+430/ouVcdNVT3qwrDgrM6PaYyRtw==
 
 sass-loader@^13.2.2:
-  version "13.2.2"
-  resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-13.2.2.tgz#f97e803993b24012c10d7ba9676548bf7a6b18b9"
-  integrity sha512-nrIdVAAte3B9icfBiGWvmMhT/D+eCDwnk+yA7VE/76dp/WkHX+i44Q/pfo71NYbwj0Ap+PGsn0ekOuU1WFJ2AA==
+  version "13.3.2"
+  resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-13.3.2.tgz#460022de27aec772480f03de17f5ba88fa7e18c6"
+  integrity sha512-CQbKl57kdEv+KDLquhC+gE3pXt74LEAzm+tzywcA0/aHZuub8wTErbjAoNI57rPUWRYRNC5WUnNl8eGJNbDdwg==
   dependencies:
-    klona "^2.0.6"
     neo-async "^2.6.2"
 
 sass@^1.60.0:
-  version "1.60.0"
-  resolved "https://registry.yarnpkg.com/sass/-/sass-1.60.0.tgz#657f0c23a302ac494b09a5ba8497b739fb5b5a81"
-  integrity sha512-updbwW6fNb5gGm8qMXzVO7V4sWf7LMXnMly/JEyfbfERbVH46Fn6q02BX7/eHTdKpE7d+oTkMMQpFWNUMfFbgQ==
+  version "1.64.2"
+  resolved "https://registry.yarnpkg.com/sass/-/sass-1.64.2.tgz#0d9805ad6acf31c59c3acc725fcfb91b7fcc6909"
+  integrity sha512-TnDlfc+CRnUAgLO9D8cQLFu/GIjJIzJCGkE7o4ekIGQOH7T3GetiRR/PsTWJUHhkzcSPrARkPI+gNWn5alCzDg==
   dependencies:
     chokidar ">=3.0.0 <4.0.0"
     immutable "^4.0.0"
@@ -6347,30 +6245,35 @@ scheduler@^0.20.2:
     loose-envify "^1.1.0"
     object-assign "^4.1.1"
 
-schema-utils@^3.1.0, schema-utils@^3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.1.1.tgz#bc74c4b6b6995c1d88f76a8b77bea7219e0c8281"
-  integrity sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==
+schema-utils@^3.1.1, schema-utils@^3.2.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.3.0.tgz#f50a88877c3c01652a15b622ae9e9795df7a60fe"
+  integrity sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==
   dependencies:
     "@types/json-schema" "^7.0.8"
     ajv "^6.12.5"
     ajv-keywords "^3.5.2"
 
 schema-utils@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-4.0.0.tgz#60331e9e3ae78ec5d16353c467c34b3a0a1d3df7"
-  integrity sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg==
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-4.2.0.tgz#70d7c93e153a273a805801882ebd3bff20d89c8b"
+  integrity sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==
   dependencies:
     "@types/json-schema" "^7.0.9"
-    ajv "^8.8.0"
+    ajv "^8.9.0"
     ajv-formats "^2.1.1"
-    ajv-keywords "^5.0.0"
+    ajv-keywords "^5.1.0"
 
 screenfull@^5.1.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/screenfull/-/screenfull-5.2.0.tgz#6533d524d30621fc1283b9692146f3f13a93d1ba"
   integrity sha512-9BakfsO2aUQN2K9Fdbj87RJIEZ82Q9IGim7FqM5OsebfoFC6ZHXgDq/KvniuLTPdeM8wY2o6Dj3WQ7KeQCj3cA==
 
+sdp@^2.1.0:
+  version "2.12.0"
+  resolved "https://registry.yarnpkg.com/sdp/-/sdp-2.12.0.tgz#338a106af7560c86e4523f858349680350d53b22"
+  integrity sha512-jhXqQAQVM+8Xj5EjJGVweuEzgtGWb3tmEEpl3CLP3cStInSbVHSg0QWOGQzNq8pSID4JkpeV2mPqlMDLrm0/Vw==
+
 semver-compare@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz#0dee216a1c941ab37e9efb1788f6afc5ff5537fc"
@@ -6389,9 +6292,9 @@ semver@5.4.1:
   integrity sha512-WfG/X9+oATh81XtllIo/I8gOiY9EXRdv1cQdyykeXK17YcUW3EXUAi2To4pcH6nZtJPr7ZOpM5OMyWJZm+8Rsg==
 
 semver@^5.5.0, semver@^5.6.0:
-  version "5.7.1"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
-  integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
+  version "5.7.2"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.2.tgz#48d55db737c3287cd4835e17fa13feace1c41ef8"
+  integrity sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==
 
 semver@^6.0.0, semver@^6.2.0, semver@^6.3.0, semver@^6.3.1:
   version "6.3.1"
@@ -6412,17 +6315,24 @@ serialize-error@^7.0.1:
   dependencies:
     type-fest "^0.13.1"
 
-serialize-javascript@6.0.0, serialize-javascript@^6.0.0:
+serialize-javascript@6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.0.tgz#efae5d88f45d7924141da8b5c3a7a7e663fefeb8"
   integrity sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==
   dependencies:
     randombytes "^2.1.0"
 
+serialize-javascript@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.1.tgz#b206efb27c3da0b0ab6b52f48d170b7996458e5c"
+  integrity sha512-owoXEFjWRllis8/M1Q+Cw5k8ZH40e3zhp/ovX+Xr/vi1qj6QesbyXXViFbpNvWvPNAD62SutwEXavefrLJWj7w==
+  dependencies:
+    randombytes "^2.1.0"
+
 set-blocking@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
-  integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc=
+  integrity sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==
 
 set-harmonic-interval@^1.0.1:
   version "1.0.1"
@@ -6444,7 +6354,7 @@ shallowequal@^1.1.0:
 shebang-command@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"
-  integrity sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=
+  integrity sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg==
   dependencies:
     shebang-regex "^1.0.0"
 
@@ -6458,7 +6368,7 @@ shebang-command@^2.0.0:
 shebang-regex@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
-  integrity sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=
+  integrity sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ==
 
 shebang-regex@^3.0.0:
   version "3.0.0"
@@ -6517,20 +6427,20 @@ smart-buffer@^4.0.2, smart-buffer@^4.2.0:
   integrity sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==
 
 socks-proxy-agent@^6.1.0:
-  version "6.2.0"
-  resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-6.2.0.tgz#f6b5229cc0cbd6f2f202d9695f09d871e951c85e"
-  integrity sha512-wWqJhjb32Q6GsrUqzuFkukxb/zzide5quXYcMVpIjxalDBBYy2nqKCFQ/9+Ie4dvOYSQdOk3hUlZSdzZOd3zMQ==
+  version "6.2.1"
+  resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-6.2.1.tgz#2687a31f9d7185e38d530bef1944fe1f1496d6ce"
+  integrity sha512-a6KW9G+6B3nWZ1yB8G7pJwL3ggLy1uTzKAgCb7ttblwqdz9fMGJUuTy3uFzEP48FAs9FLILlmzDlE2JJhVQaXQ==
   dependencies:
     agent-base "^6.0.2"
     debug "^4.3.3"
     socks "^2.6.2"
 
 socks@^2.6.2:
-  version "2.6.2"
-  resolved "https://registry.yarnpkg.com/socks/-/socks-2.6.2.tgz#ec042d7960073d40d94268ff3bb727dc685f111a"
-  integrity sha512-zDZhHhZRY9PxRruRMR7kMhnf3I8hDs4S3f9RecfnGxvcBHQcKcIH/oUcEWffsfl1XxdYlA7nnlGbbTvPz9D8gA==
+  version "2.7.1"
+  resolved "https://registry.yarnpkg.com/socks/-/socks-2.7.1.tgz#d8e651247178fde79c0663043e07240196857d55"
+  integrity sha512-7maUZy1N7uo6+WVEX6psASxtNlKaNVMlGQKkG/63nEDdLOWNbiUMoLK7X4uYoLhQstau72mLgfEWcXcwsaHbYQ==
   dependencies:
-    ip "^1.1.5"
+    ip "^2.0.0"
     smart-buffer "^4.2.0"
 
 "source-map-js@>=0.6.2 <2.0.0", source-map-js@^1.0.2:
@@ -6556,12 +6466,12 @@ source-map-support@^0.5.19, source-map-support@~0.5.20:
 source-map@0.5.6:
   version "0.5.6"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.6.tgz#75ce38f52bf0733c5a7f0c118d81334a2bb5f412"
-  integrity sha1-dc449SvwczxafwwRjYEzSiu19BI=
+  integrity sha512-MjZkVp0NHr5+TPihLcadqnlVoGIoWo4IBHptutGh9wI3ttUYvCG26HkSuDi+K6lsZ25syXJXcctwgyVCt//xqA==
 
 source-map@^0.5.6:
   version "0.5.7"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
-  integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=
+  integrity sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==
 
 source-map@^0.6.0, source-map@^0.6.1:
   version "0.6.1"
@@ -6579,31 +6489,31 @@ sprintf-js@^1.1.2:
   integrity sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug==
 
 stack-generator@^2.0.5:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/stack-generator/-/stack-generator-2.0.5.tgz#fb00e5b4ee97de603e0773ea78ce944d81596c36"
-  integrity sha512-/t1ebrbHkrLrDuNMdeAcsvynWgoH/i4o8EGGfX7dEYDoTXOYVAkEpFdtshlvabzc6JlJ8Kf9YdFEoz7JkzGN9Q==
+  version "2.0.10"
+  resolved "https://registry.yarnpkg.com/stack-generator/-/stack-generator-2.0.10.tgz#8ae171e985ed62287d4f1ed55a1633b3fb53bb4d"
+  integrity sha512-mwnua/hkqM6pF4k8SnmZ2zfETsRUpWXREfA/goT8SLCV4iOFa4bzOX2nDipWAZFPTjLvQB82f5yaodMVhK0yJQ==
   dependencies:
-    stackframe "^1.1.1"
+    stackframe "^1.3.4"
 
 stack-utils@^2.0.3:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-2.0.5.tgz#d25265fca995154659dbbfba3b49254778d2fdd5"
-  integrity sha512-xrQcmYhOsn/1kX+Vraq+7j4oE2j/6BFscZ0etmYg81xuM8Gq0022Pxb8+IqgOFUIaxHs0KaSb7T1+OegiNrNFA==
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-2.0.6.tgz#aaf0748169c02fc33c8232abccf933f54a1cc34f"
+  integrity sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ==
   dependencies:
     escape-string-regexp "^2.0.0"
 
-stackframe@^1.1.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/stackframe/-/stackframe-1.2.1.tgz#1033a3473ee67f08e2f2fc8eba6aef4f845124e1"
-  integrity sha512-h88QkzREN/hy8eRdyNhhsO7RSJ5oyTqxxmmn0dzBIMUclZsjpfmrsg81vp8mjjAs2vAZ72nyWxRUwSwmh0e4xg==
+stackframe@^1.3.4:
+  version "1.3.4"
+  resolved "https://registry.yarnpkg.com/stackframe/-/stackframe-1.3.4.tgz#b881a004c8c149a5e8efef37d51b16e412943310"
+  integrity sha512-oeVtt7eWQS+Na6F//S4kJ2K2VbRlS9D43mAlMyVpVWovy9o+jfgH8O9agzANzaiLjclA0oYzUXEM4PurhSUChw==
 
 stacktrace-gps@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/stacktrace-gps/-/stacktrace-gps-3.0.4.tgz#7688dc2fc09ffb3a13165ebe0dbcaf41bcf0c69a"
-  integrity sha512-qIr8x41yZVSldqdqe6jciXEaSCKw1U8XTXpjDuy0ki/apyTn/r3w9hDAAQOhZdxvsC93H+WwwEu5cq5VemzYeg==
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/stacktrace-gps/-/stacktrace-gps-3.1.2.tgz#0c40b24a9b119b20da4525c398795338966a2fb0"
+  integrity sha512-GcUgbO4Jsqqg6RxfyTHFiPxdPqF+3LFmQhm7MgCuYQOYuWyqxo5pwRPz5d/u6/WYJdEnWfK4r+jGbyD8TSggXQ==
   dependencies:
     source-map "0.5.6"
-    stackframe "^1.1.1"
+    stackframe "^1.3.4"
 
 stacktrace-js@^2.0.2:
   version "2.0.2"
@@ -6679,7 +6589,7 @@ string_decoder@^1.1.1:
 strip-ansi@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
-  integrity sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=
+  integrity sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==
   dependencies:
     ansi-regex "^2.0.0"
 
@@ -6693,7 +6603,7 @@ strip-ansi@^6.0.0, strip-ansi@^6.0.1:
 strip-bom@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
-  integrity sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=
+  integrity sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==
 
 strip-final-newline@^2.0.0:
   version "2.0.0"
@@ -6708,7 +6618,7 @@ strip-json-comments@3.1.1, strip-json-comments@^3.1.1:
 strip-json-comments@~2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
-  integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo=
+  integrity sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==
 
 styled-components@5.1.1:
   version "5.1.1"
@@ -6727,9 +6637,9 @@ styled-components@5.1.1:
     supports-color "^5.5.0"
 
 stylis@^4.0.6:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/stylis/-/stylis-4.1.1.tgz#e46c6a9bbf7c58db1e65bb730be157311ae1fe12"
-  integrity sha512-lVrM/bNdhVX2OgBFNa2YJ9Lxj7kPzylieHd3TNjuGE0Re9JB7joL5VUKOVH1kdNNJTgGPpT8hmwIAPLaSyEVFQ==
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/stylis/-/stylis-4.3.0.tgz#abe305a669fc3d8777e10eefcfc73ad861c5588c"
+  integrity sha512-E87pIogpwUsUwXw7dNyU4QDjdgVMy52m+XEOPEKUn161cCzWjjhPSQhByfd1CcNvrOLnXQ6OnnZDwnJrz/Z4YQ==
 
 substyle@^9.1.0:
   version "9.4.1"
@@ -6756,7 +6666,7 @@ supports-color@8.1.1, supports-color@^8.0.0:
 supports-color@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
-  integrity sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=
+  integrity sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g==
 
 supports-color@^5.3.0, supports-color@^5.5.0:
   version "5.5.0"
@@ -6793,13 +6703,13 @@ tapable@^2.1.1, tapable@^2.2.0:
   integrity sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==
 
 tar@^6.1.0, tar@^6.1.11:
-  version "6.1.11"
-  resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.11.tgz#6760a38f003afa1b2ffd0ffe9e9abbd0eab3d621"
-  integrity sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA==
+  version "6.1.15"
+  resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.15.tgz#c9738b0b98845a3b344d334b8fa3041aaba53a69"
+  integrity sha512-/zKt9UyngnxIT/EAGYuxaMYgOIJiP81ab9ZfkILq4oNLPFX50qyYmu7jRj9qeXoxmJHjGlbH0+cm2uy1WCs10A==
   dependencies:
     chownr "^2.0.0"
     fs-minipass "^2.0.0"
-    minipass "^3.0.0"
+    minipass "^5.0.0"
     minizlib "^2.1.1"
     mkdirp "^1.0.3"
     yallist "^4.0.0"
@@ -6812,31 +6722,31 @@ temp-file@^3.4.0:
     async-exit-hook "^2.0.1"
     fs-extra "^10.0.0"
 
-terser-webpack-plugin@^5.1.3:
-  version "5.3.6"
-  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.6.tgz#5590aec31aa3c6f771ce1b1acca60639eab3195c"
-  integrity sha512-kfLFk+PoLUQIbLmB1+PZDMRSZS99Mp+/MHqDNmMA6tOItzRt+Npe3E+fsMs5mfcM0wCtrrdU387UnV+vnSffXQ==
+terser-webpack-plugin@^5.3.7:
+  version "5.3.9"
+  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.9.tgz#832536999c51b46d468067f9e37662a3b96adfe1"
+  integrity sha512-ZuXsqE07EcggTWQjXUj+Aot/OMcD0bMKGgF63f7UxYcu5/AJF53aIpK1YoP5xR9l6s/Hy2b+t1AM0bLNPRuhwA==
   dependencies:
-    "@jridgewell/trace-mapping" "^0.3.14"
+    "@jridgewell/trace-mapping" "^0.3.17"
     jest-worker "^27.4.5"
     schema-utils "^3.1.1"
-    serialize-javascript "^6.0.0"
-    terser "^5.14.1"
+    serialize-javascript "^6.0.1"
+    terser "^5.16.8"
 
-terser@^5.14.1, terser@^5.14.2:
-  version "5.16.1"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-5.16.1.tgz#5af3bc3d0f24241c7fb2024199d5c461a1075880"
-  integrity sha512-xvQfyfA1ayT0qdK47zskQgRZeWLoOQ8JQ6mIgRGVNwZKdQMU+5FkCBjmv4QjcrTzyZquRw2FVtlJSRUmMKQslw==
+terser@^5.14.2, terser@^5.16.8:
+  version "5.19.2"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-5.19.2.tgz#bdb8017a9a4a8de4663a7983f45c506534f9234e"
+  integrity sha512-qC5+dmecKJA4cpYxRa5aVkKehYsQKc+AHeKl0Oe62aYjBL8ZA33tTljktDHJSaxxMnbI5ZYw+o/S2DxxLu8OfA==
   dependencies:
-    "@jridgewell/source-map" "^0.3.2"
-    acorn "^8.5.0"
+    "@jridgewell/source-map" "^0.3.3"
+    acorn "^8.8.2"
     commander "^2.20.0"
     source-map-support "~0.5.20"
 
 text-table@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
-  integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=
+  integrity sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==
 
 throttle-debounce@^3.0.1:
   version "3.0.1"
@@ -6867,7 +6777,7 @@ tmp@^0.2.0:
 to-fast-properties@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e"
-  integrity sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=
+  integrity sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==
 
 to-regex-range@^5.0.1:
   version "5.0.1"
@@ -6879,7 +6789,7 @@ to-regex-range@^5.0.1:
 toggle-selection@^1.0.6:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/toggle-selection/-/toggle-selection-1.0.6.tgz#6e45b1263f2017fa0acc7d89d78b15b8bf77da32"
-  integrity sha1-bkWxJj8gF/oKzH2J14sVuL932jI=
+  integrity sha512-BiZS+C1OS8g/q2RRbJmy59xpyghNBqrr6k5L/uKBGRsTfxmu3ffiRnd8mlGPUVayg8pvfi5urfnu8TU7DVOkLQ==
 
 tough-cookie@^4.1.2:
   version "4.1.3"
@@ -6906,7 +6816,7 @@ tr46@~0.0.3:
 truncate-utf8-bytes@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/truncate-utf8-bytes/-/truncate-utf8-bytes-1.0.2.tgz#405923909592d56f78a5818434b0b78489ca5f2b"
-  integrity sha1-QFkjkJWS1W94pYGENLC3hInKXys=
+  integrity sha512-95Pu1QXQvruGEhv62XCMO3Mm90GscOCClvrIUwCM0PYOXK3kaF3l3sIHxx71ThJfcbM2O5Au6SO3AWCSEfW4mQ==
   dependencies:
     utf8-byte-length "^1.0.1"
 
@@ -6921,29 +6831,29 @@ ts-easing@^0.2.0:
   integrity sha512-Z86EW+fFFh/IFB1fqQ3/+7Zpf9t2ebOAxNI/V6Wo7r5gqiqtxmgTlQ1qbqQcjLKYeSHPTsEmvlJUDg/EuL0uHQ==
 
 ts-loader@^9.4.2:
-  version "9.4.2"
-  resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-9.4.2.tgz#80a45eee92dd5170b900b3d00abcfa14949aeb78"
-  integrity sha512-OmlC4WVmFv5I0PpaxYb+qGeGOdm5giHU7HwDDUjw59emP2UYMHy9fFSDcYgSNoH8sXcj4hGCSEhlDZ9ULeDraA==
+  version "9.4.4"
+  resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-9.4.4.tgz#6ceaf4d58dcc6979f84125335904920884b7cee4"
+  integrity sha512-MLukxDHBl8OJ5Dk3y69IsKVFRA/6MwzEqBgh+OXMPB/OD01KQuWPFd1WAQP8a5PeSCAxfnkhiuWqfmFJzJQt9w==
   dependencies:
     chalk "^4.1.0"
     enhanced-resolve "^5.0.0"
     micromatch "^4.0.0"
     semver "^7.3.4"
 
-tsconfig-paths@^3.14.1:
-  version "3.14.1"
-  resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz#ba0734599e8ea36c862798e920bcf163277b137a"
-  integrity sha512-fxDhWnFSLt3VuTwtvJt5fpwxBHg5AdKWMsgcPOOIilyjymcYVZoCQF8fvFRezCNfblEXmi+PcM1eYHeOAgXCOQ==
+tsconfig-paths@^3.14.2:
+  version "3.14.2"
+  resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.14.2.tgz#6e32f1f79412decd261f92d633a9dc1cfa99f088"
+  integrity sha512-o/9iXgCYc5L/JxCHPe3Hvh8Q/2xm5Z+p18PESBU6Ff33695QnCHBEjcytY2q19ua7Mbl/DavtBOLq+oG0RCL+g==
   dependencies:
     "@types/json5" "^0.0.29"
-    json5 "^1.0.1"
+    json5 "^1.0.2"
     minimist "^1.2.6"
     strip-bom "^3.0.0"
 
 tslib@^2.1.0:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.4.0.tgz#7cecaa7f073ce680a05847aa77be941098f36dc3"
-  integrity sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==
+  version "2.6.1"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.1.tgz#fd8c9a0ff42590b25703c0acb3de3d3f4ede0410"
+  integrity sha512-t0hLfiEKfMUoqhG+U1oid7Pva4bbDPHYfJNiB7BiIjRkj1pyC++4N3huJfqY6aRH6VTB0rvtzQwjM4K6qpfOig==
 
 type-check@^0.4.0, type-check@~0.4.0:
   version "0.4.0"
@@ -7034,9 +6944,9 @@ unbox-primitive@^1.0.2:
     which-boxed-primitive "^1.0.2"
 
 underscore@>=1.8.3:
-  version "1.13.3"
-  resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.13.3.tgz#54bc95f7648c5557897e5e968d0f76bc062c34ee"
-  integrity sha512-QvjkYpiD+dJJraRA8+dGAU4i7aBbb2s0S3jA45TFOvg2VgqvdCDd/3N6CqA8gluk1W91GLoXg5enMUx560QzuA==
+  version "1.13.6"
+  resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.13.6.tgz#04786a1f589dc6c09f761fc5f45b89e935136441"
+  integrity sha512-+A5Sja4HP1M08MaXya7p5LvjuM7K6q/2EaC0+iovj/wOcMsTzMvDFbasi/oSapiwOlt252IqsKqPjCl7huKS0A==
 
 unique-string@^2.0.0:
   version "2.0.0"
@@ -7065,10 +6975,10 @@ universalify@^2.0.0:
   resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717"
   integrity sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==
 
-update-browserslist-db@^1.0.9:
-  version "1.0.10"
-  resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz#0f54b876545726f17d00cd9a2561e6dade943ff3"
-  integrity sha512-OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ==
+update-browserslist-db@^1.0.11:
+  version "1.0.11"
+  resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.11.tgz#9a2a641ad2907ae7b3616506f4b977851db5b940"
+  integrity sha512-dCwEFf0/oT85M1fHBg4F0jtLwJrutGoHSQXCh7u4o2t1drG+c0a9Flnqww6XUKSfQMPpJBRjU8d4RXB09qtvaA==
   dependencies:
     escalade "^3.1.1"
     picocolors "^1.0.0"
@@ -7116,7 +7026,7 @@ url-parse@^1.5.3:
 use-strict@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/use-strict/-/use-strict-1.0.1.tgz#0bb80d94f49a4a05192b84a8c7d34e95f1a7e3a0"
-  integrity sha1-C7gNlPSaSgUZK4Sox9NOlfGn46A=
+  integrity sha512-IeiWvvEXfW5ltKVMkxq6FvNf2LojMKvB2OCeja6+ct24S1XOmQw2dGr2JyndwACWAGJva9B7yPHwAmeA9QCqAQ==
 
 use-sync-external-store@^1.0.0:
   version "1.2.0"
@@ -7126,12 +7036,12 @@ use-sync-external-store@^1.0.0:
 utf8-byte-length@^1.0.1:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/utf8-byte-length/-/utf8-byte-length-1.0.4.tgz#f45f150c4c66eee968186505ab93fcbb8ad6bf61"
-  integrity sha1-9F8VDExm7uloGGUFq5P8u4rWv2E=
+  integrity sha512-4+wkEYLBbWxqTahEsWrhxepcoVOJ+1z5PGIjPZxRkytcdSUaNjIjBM7Xn8E+pdSuV7SzvWovBFA54FO0JSoqhA==
 
 util-deprecate@^1.0.1, util-deprecate@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
-  integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
+  integrity sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==
 
 uuid@8.3.2:
   version "8.3.2"
@@ -7154,13 +7064,6 @@ w3c-xmlserializer@^4.0.0:
   dependencies:
     xml-name-validator "^4.0.0"
 
-warning@^4.0.3:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/warning/-/warning-4.0.3.tgz#16e9e077eb8a86d6af7d64aa1e05fd85b4678ca3"
-  integrity sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==
-  dependencies:
-    loose-envify "^1.0.0"
-
 watchpack@^2.4.0:
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.4.0.tgz#fa33032374962c78113f93c7f2fb4c54c9862a5d"
@@ -7212,21 +7115,21 @@ webpack-sources@^3.2.3:
   integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==
 
 webpack@^5.76.3:
-  version "5.76.3"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.76.3.tgz#dffdc72c8950e5b032fddad9c4452e7787d2f489"
-  integrity sha512-18Qv7uGPU8b2vqGeEEObnfICyw2g39CHlDEK4I7NK13LOur1d0HGmGNKGT58Eluwddpn3oEejwvBPoP4M7/KSA==
+  version "5.88.2"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.88.2.tgz#f62b4b842f1c6ff580f3fcb2ed4f0b579f4c210e"
+  integrity sha512-JmcgNZ1iKj+aiR0OvTYtWQqJwq37Pf683dY9bVORwVbUrDhLhdn/PlO2sHsFHPkj7sHNQF3JwaAkp49V+Sq1tQ==
   dependencies:
     "@types/eslint-scope" "^3.7.3"
-    "@types/estree" "^0.0.51"
-    "@webassemblyjs/ast" "1.11.1"
-    "@webassemblyjs/wasm-edit" "1.11.1"
-    "@webassemblyjs/wasm-parser" "1.11.1"
+    "@types/estree" "^1.0.0"
+    "@webassemblyjs/ast" "^1.11.5"
+    "@webassemblyjs/wasm-edit" "^1.11.5"
+    "@webassemblyjs/wasm-parser" "^1.11.5"
     acorn "^8.7.1"
-    acorn-import-assertions "^1.7.6"
+    acorn-import-assertions "^1.9.0"
     browserslist "^4.14.5"
     chrome-trace-event "^1.0.2"
-    enhanced-resolve "^5.10.0"
-    es-module-lexer "^0.9.0"
+    enhanced-resolve "^5.15.0"
+    es-module-lexer "^1.2.1"
     eslint-scope "5.1.1"
     events "^3.2.0"
     glob-to-regexp "^0.4.1"
@@ -7235,12 +7138,19 @@ webpack@^5.76.3:
     loader-runner "^4.2.0"
     mime-types "^2.1.27"
     neo-async "^2.6.2"
-    schema-utils "^3.1.0"
+    schema-utils "^3.2.0"
     tapable "^2.1.1"
-    terser-webpack-plugin "^5.1.3"
+    terser-webpack-plugin "^5.3.7"
     watchpack "^2.4.0"
     webpack-sources "^3.2.3"
 
+webrtc-adapter@^4.1.1:
+  version "4.2.2"
+  resolved "https://registry.yarnpkg.com/webrtc-adapter/-/webrtc-adapter-4.2.2.tgz#17896c047084fd4c567958a0cd4321e17f32773c"
+  integrity sha512-JV2mqgwd8K+n0YrwohZgpZceojJRmC+1CsSTNOTdjDOKwCpffeY49d/0lks7dzw+nMtz8XQs9yaUafXh4iCINg==
+  dependencies:
+    sdp "^2.1.0"
+
 whatwg-encoding@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-2.0.0.tgz#e7635f597fd87020858626805a2729fa7698ac53"
@@ -7341,7 +7251,7 @@ wrap-ansi@^7.0.0:
 wrappy@1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
-  integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
+  integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==
 
 write-file-atomic@^3.0.0:
   version "3.0.3"
@@ -7354,9 +7264,9 @@ write-file-atomic@^3.0.0:
     typedarray-to-buffer "^3.1.5"
 
 ws@^7.4.6:
-  version "7.5.7"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.7.tgz#9e0ac77ee50af70d58326ecff7e85eb3fa375e67"
-  integrity sha512-KMvVuFzpKBuiIXW3E4u3mySRO2/mCHSyZDJQM5NQ9Q9KHWHWh0NHgfbRMLLrceUK5qAL4ytALJbpRMjixFZh8A==
+  version "7.5.9"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.9.tgz#54fa7db29f4c7cec68b1ddd3a89de099942bb591"
+  integrity sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==
 
 ws@^8.13.0:
   version "8.13.0"
@@ -7388,11 +7298,21 @@ y18n@^5.0.5:
   resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55"
   integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==
 
+yallist@^3.0.2:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd"
+  integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==
+
 yallist@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
   integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
 
+yaml@^1.10.2:
+  version "1.10.2"
+  resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b"
+  integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==
+
 yargs-parser@20.2.4:
   version "20.2.4"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.4.tgz#b42890f14566796f85ae8e3a25290d205f154a54"
@@ -7447,7 +7367,7 @@ yargs@^17.0.1, yargs@^17.6.0:
 yauzl@^2.10.0:
   version "2.10.0"
   resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz#c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9"
-  integrity sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk=
+  integrity sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==
   dependencies:
     buffer-crc32 "~0.2.3"
     fd-slicer "~1.1.0"

From 41ca0666cedc3ac6f1153c9d64c8aa51f6503f60 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Wed, 2 Aug 2023 10:19:33 +0200
Subject: [PATCH 6/8] chore: remove () => void for misused promises

---
 ts/components/SessionScrollButton.tsx         |  3 ++-
 ts/components/basic/SessionInput.tsx          |  3 ++-
 ts/components/calling/CallButtons.tsx         |  3 ++-
 ts/components/calling/IncomingCallDialog.tsx  |  5 ++--
 .../SessionMessagesListContainer.tsx          |  3 ++-
 .../conversation/SessionRightPanel.tsx        | 10 ++++----
 .../composition/CompositionBox.tsx            | 24 +++++++++----------
 .../composition/CompositionButtons.tsx        |  9 +++----
 .../message-content/ClickToTrustSender.tsx    |  3 ++-
 .../message/message-content/MessageAvatar.tsx |  7 ++----
 .../MessageContentWithStatus.tsx              |  3 ++-
 .../message-content/MessageContextMenu.tsx    | 11 +++++----
 .../message/message-content/MessageQuote.tsx  |  3 ++-
 ts/components/dialog/EditProfileDialog.tsx    |  3 ++-
 .../conversation-list-item/HeaderItem.tsx     |  3 ++-
 .../leftpane/overlay/OverlayCommunity.tsx     |  6 ++---
 .../overlay/choose-action/ContactRow.tsx      |  3 ++-
 ts/components/menu/Menu.tsx                   | 15 ++++++++----
 ts/components/registration/SignUpTab.tsx      |  5 ++--
 .../settings/SessionSettingListItem.tsx       |  3 ++-
 ts/node/menu.ts                               |  3 ++-
 ts/state/ducks/modalDialog.tsx                |  3 ++-
 ts/types/Util.ts                              |  2 ++
 ts/util/expiringMessages.ts                   |  6 +++--
 24 files changed, 83 insertions(+), 56 deletions(-)

diff --git a/ts/components/SessionScrollButton.tsx b/ts/components/SessionScrollButton.tsx
index 4019faaf2c..5c7543da23 100644
--- a/ts/components/SessionScrollButton.tsx
+++ b/ts/components/SessionScrollButton.tsx
@@ -4,6 +4,7 @@ import styled from 'styled-components';
 import { getShowScrollButton } from '../state/selectors/conversations';
 
 import { SessionIconButton } from './icon';
+import { Noop } from '../types/Util';
 
 const SessionScrollButtonDiv = styled.div`
   position: fixed;
@@ -17,7 +18,7 @@ const SessionScrollButtonDiv = styled.div`
   }
 `;
 
-export const SessionScrollButton = (props: { onClickScrollBottom: () => void }) => {
+export const SessionScrollButton = (props: { onClickScrollBottom: Noop }) => {
   const show = useSelector(getShowScrollButton);
 
   return (
diff --git a/ts/components/basic/SessionInput.tsx b/ts/components/basic/SessionInput.tsx
index e3425173d6..2143b74136 100644
--- a/ts/components/basic/SessionInput.tsx
+++ b/ts/components/basic/SessionInput.tsx
@@ -2,6 +2,7 @@ import React, { useState } from 'react';
 
 import classNames from 'classnames';
 import { SessionIconButton } from '../icon';
+import { Noop } from '../../types/Util';
 
 type Props = {
   label?: string;
@@ -44,7 +45,7 @@ const ErrorItem = (props: { error: string | undefined }) => {
   );
 };
 
-const ShowHideButton = (props: { toggleForceShow: () => void }) => {
+const ShowHideButton = (props: { toggleForceShow: Noop }) => {
   return <SessionIconButton iconType="eye" iconSize="medium" onClick={props.toggleForceShow} />;
 };
 
diff --git a/ts/components/calling/CallButtons.tsx b/ts/components/calling/CallButtons.tsx
index acb84dae82..a599c30923 100644
--- a/ts/components/calling/CallButtons.tsx
+++ b/ts/components/calling/CallButtons.tsx
@@ -282,7 +282,8 @@ export const HangUpButton = ({ isFullScreen }: { isFullScreen: boolean }) => {
         iconType="hangup"
         iconColor="var(--danger-color)"
         borderRadius="50%"
-        onClick={() => void handleEndCall()}
+        // eslint-disable-next-line @typescript-eslint/no-misused-promises
+        onClick={handleEndCall}
         margin="10px"
         dataTestId="end-call"
       />
diff --git a/ts/components/calling/IncomingCallDialog.tsx b/ts/components/calling/IncomingCallDialog.tsx
index 98dd119081..ccaba5c465 100644
--- a/ts/components/calling/IncomingCallDialog.tsx
+++ b/ts/components/calling/IncomingCallDialog.tsx
@@ -35,14 +35,15 @@ export const IncomingCallDialog = () => {
   useEffect(() => {
     let timeout: NodeJS.Timeout;
     if (incomingCallFromPubkey) {
-      timeout = global.setTimeout(() => {
+      // eslint-disable-next-line @typescript-eslint/no-misused-promises
+      timeout = global.setTimeout(async () => {
         if (incomingCallFromPubkey) {
           window.log.info(
             `call missed with ${ed25519Str(
               incomingCallFromPubkey
             )} as the dialog was not interacted with for ${callTimeoutMs} ms`
           );
-          void CallManager.USER_rejectIncomingCallRequest(incomingCallFromPubkey);
+          await CallManager.USER_rejectIncomingCallRequest(incomingCallFromPubkey);
         }
       }, callTimeoutMs);
     }
diff --git a/ts/components/conversation/SessionMessagesListContainer.tsx b/ts/components/conversation/SessionMessagesListContainer.tsx
index 6fde12df26..92941a56df 100644
--- a/ts/components/conversation/SessionMessagesListContainer.tsx
+++ b/ts/components/conversation/SessionMessagesListContainer.tsx
@@ -144,7 +144,8 @@ class SessionMessagesListContainerInner extends React.Component<Props> {
         </ScrollToLoadedMessageContext.Provider>
 
         <SessionScrollButton
-          onClickScrollBottom={() => void this.props.scrollToNow()}
+          // eslint-disable-next-line @typescript-eslint/no-misused-promises
+          onClickScrollBottom={this.props.scrollToNow}
           key="scroll-down-button"
         />
       </StyledMessagesContainer>
diff --git a/ts/components/conversation/SessionRightPanel.tsx b/ts/components/conversation/SessionRightPanel.tsx
index 9bbb628def..8117d4e03f 100644
--- a/ts/components/conversation/SessionRightPanel.tsx
+++ b/ts/components/conversation/SessionRightPanel.tsx
@@ -301,8 +301,9 @@ export const SessionRightPanelWithDetails = () => {
         <StyledGroupSettingsItem
           className="group-settings-item"
           role="button"
-          onClick={() => {
-            void showUpdateGroupNameByConvoId(selectedConvoKey);
+          // eslint-disable-next-line @typescript-eslint/no-misused-promises
+          onClick={async () => {
+            await showUpdateGroupNameByConvoId(selectedConvoKey);
           }}
         >
           {isPublic ? window.i18n('editGroup') : window.i18n('editGroupName')}
@@ -335,8 +336,9 @@ export const SessionRightPanelWithDetails = () => {
         <StyledGroupSettingsItem
           className="group-settings-item"
           role="button"
-          onClick={() => {
-            void showUpdateGroupMembersByConvoId(selectedConvoKey);
+          // eslint-disable-next-line @typescript-eslint/no-misused-promises
+          onClick={async () => {
+            await showUpdateGroupMembersByConvoId(selectedConvoKey);
           }}
         >
           {window.i18n('groupMembers')}
diff --git a/ts/components/conversation/composition/CompositionBox.tsx b/ts/components/conversation/composition/CompositionBox.tsx
index c4b4eb436a..689a3025cd 100644
--- a/ts/components/conversation/composition/CompositionBox.tsx
+++ b/ts/components/conversation/composition/CompositionBox.tsx
@@ -404,7 +404,8 @@ class CompositionBoxInner extends React.Component<Props, State> {
     return (
       <SessionRecording
         sendVoiceMessage={this.sendVoiceMessage}
-        onLoadVoiceNoteView={() => void this.onLoadVoiceNoteView()}
+        // eslint-disable-next-line @typescript-eslint/no-misused-promises
+        onLoadVoiceNoteView={this.onLoadVoiceNoteView}
         onExitVoiceNoteView={this.onExitVoiceNoteView}
       />
     );
@@ -413,22 +414,20 @@ class CompositionBoxInner extends React.Component<Props, State> {
   private renderCompositionView() {
     const { showEmojiPanel } = this.state;
     const { typingEnabled } = this.props;
+    /* eslint-disable @typescript-eslint/no-misused-promises */
 
     return (
       <>
         {typingEnabled && <AddStagedAttachmentButton onClick={this.onChooseAttachment} />}
-
         <input
           className="hidden"
           placeholder="Attachment"
           multiple={true}
           ref={this.fileInput}
           type="file"
-          onChange={() => void this.onChoseAttachment()}
+          onChange={this.onChoseAttachment}
         />
-
-        {typingEnabled && <StartRecordingButton onClick={() => void this.onLoadVoiceNoteView()} />}
-
+        {typingEnabled && <StartRecordingButton onClick={this.onLoadVoiceNoteView} />}
         <StyledSendMessageInput
           role="main"
           onClick={this.focusCompositionBox} // used to focus on the textarea when clicking in its container
@@ -439,25 +438,24 @@ class CompositionBoxInner extends React.Component<Props, State> {
         >
           {this.renderTextArea()}
         </StyledSendMessageInput>
-
         {typingEnabled && (
           <ToggleEmojiButton ref={this.emojiPanelButton} onClick={this.toggleEmojiPanel} />
         )}
-        <SendMessageButton onClick={() => void this.onSendMessage()} />
-
+        <SendMessageButton onClick={this.onSendMessage} />
         {typingEnabled && showEmojiPanel && (
           <StyledEmojiPanelContainer role="button">
             <SessionEmojiPanel
               ref={this.emojiPanel}
               show={showEmojiPanel}
               onEmojiClicked={this.onEmojiClick}
-              onKeyDown={e => void this.onKeyDown(e)}
+              onKeyDown={this.onKeyDown}
             />
           </StyledEmojiPanelContainer>
         )}
       </>
     );
   }
+  /* eslint-enable @typescript-eslint/no-misused-promises */
 
   private renderTextArea() {
     const { i18n } = window;
@@ -492,8 +490,10 @@ class CompositionBoxInner extends React.Component<Props, State> {
       <MentionsInput
         value={draft}
         onChange={this.onChange}
-        onKeyDown={e => void this.onKeyDown(e)}
-        onKeyUp={() => void this.onKeyUp()}
+        // eslint-disable-next-line @typescript-eslint/no-misused-promises
+        onKeyDown={this.onKeyDown}
+        // eslint-disable-next-line @typescript-eslint/no-misused-promises
+        onKeyUp={this.onKeyUp}
         placeholder={messagePlaceHolder}
         spellCheck={true}
         inputRef={this.textarea}
diff --git a/ts/components/conversation/composition/CompositionButtons.tsx b/ts/components/conversation/composition/CompositionButtons.tsx
index bd651c3f5a..f88cdde7a4 100644
--- a/ts/components/conversation/composition/CompositionButtons.tsx
+++ b/ts/components/conversation/composition/CompositionButtons.tsx
@@ -1,6 +1,7 @@
 import React from 'react';
 import styled from 'styled-components';
 import { SessionIconButton } from '../../icon';
+import { Noop } from '../../../types/Util';
 
 const StyledChatButtonContainer = styled.div`
   .session-icon-button {
@@ -14,7 +15,7 @@ const StyledChatButtonContainer = styled.div`
   }
 `;
 
-export const AddStagedAttachmentButton = (props: { onClick: () => void }) => {
+export const AddStagedAttachmentButton = (props: { onClick: Noop }) => {
   return (
     <StyledChatButtonContainer>
       <SessionIconButton
@@ -31,7 +32,7 @@ export const AddStagedAttachmentButton = (props: { onClick: () => void }) => {
   );
 };
 
-export const StartRecordingButton = (props: { onClick: () => void }) => {
+export const StartRecordingButton = (props: { onClick: Noop }) => {
   return (
     <StyledChatButtonContainer>
       <SessionIconButton
@@ -49,7 +50,7 @@ export const StartRecordingButton = (props: { onClick: () => void }) => {
 };
 
 // eslint-disable-next-line react/display-name
-export const ToggleEmojiButton = React.forwardRef<HTMLDivElement, { onClick: () => void }>(
+export const ToggleEmojiButton = React.forwardRef<HTMLDivElement, { onClick: Noop }>(
   (props, ref) => {
     return (
       <StyledChatButtonContainer>
@@ -69,7 +70,7 @@ export const ToggleEmojiButton = React.forwardRef<HTMLDivElement, { onClick: ()
   }
 );
 
-export const SendMessageButton = (props: { onClick: () => void }) => {
+export const SendMessageButton = (props: { onClick: Noop }) => {
   return (
     <StyledChatButtonContainer className="send-message-button">
       <SessionIconButton
diff --git a/ts/components/conversation/message/message-content/ClickToTrustSender.tsx b/ts/components/conversation/message/message-content/ClickToTrustSender.tsx
index 88cb651553..25afee8a7e 100644
--- a/ts/components/conversation/message/message-content/ClickToTrustSender.tsx
+++ b/ts/components/conversation/message/message-content/ClickToTrustSender.tsx
@@ -111,7 +111,8 @@ export const ClickToTrustSender = (props: { messageId: string }) => {
   };
 
   return (
-    <StyledTrustSenderUI onClick={e => void openConfirmationModal(e)}>
+    // eslint-disable-next-line @typescript-eslint/no-misused-promises
+    <StyledTrustSenderUI onClick={openConfirmationModal}>
       <SessionIcon iconSize="small" iconType="gallery" />
       <ClickToDownload>{window.i18n('clickToTrustContact')}</ClickToDownload>
     </StyledTrustSenderUI>
diff --git a/ts/components/conversation/message/message-content/MessageAvatar.tsx b/ts/components/conversation/message/message-content/MessageAvatar.tsx
index 0994be253d..375b3158ab 100644
--- a/ts/components/conversation/message/message-content/MessageAvatar.tsx
+++ b/ts/components/conversation/message/message-content/MessageAvatar.tsx
@@ -131,6 +131,7 @@ export const MessageAvatar = (props: Props) => {
   if (!lastMessageOfSeries) {
     return <div style={{ marginInlineEnd: '60px' }} key={`msg-avatar-${sender}`} />;
   }
+  /* eslint-disable @typescript-eslint/no-misused-promises */
 
   return (
     <StyledAvatar
@@ -139,11 +140,7 @@ export const MessageAvatar = (props: Props) => {
         visibility: hideAvatar ? 'hidden' : undefined,
       }}
     >
-      <Avatar
-        size={AvatarSize.S}
-        onAvatarClick={() => void onMessageAvatarClick()}
-        pubkey={sender}
-      />
+      <Avatar size={AvatarSize.S} onAvatarClick={onMessageAvatarClick} pubkey={sender} />
       {isSenderAdmin && <CrownIcon />}
     </StyledAvatar>
   );
diff --git a/ts/components/conversation/message/message-content/MessageContentWithStatus.tsx b/ts/components/conversation/message/message-content/MessageContentWithStatus.tsx
index ad0e1bff93..d3d99fb358 100644
--- a/ts/components/conversation/message/message-content/MessageContentWithStatus.tsx
+++ b/ts/components/conversation/message/message-content/MessageContentWithStatus.tsx
@@ -147,7 +147,8 @@ export const MessageContentWithStatuses = (props: Props) => {
       {enableReactions && (
         <MessageReactions
           messageId={messageId}
-          onClick={emoji => void handleMessageReaction(emoji)}
+          // eslint-disable-next-line @typescript-eslint/no-misused-promises
+          onClick={handleMessageReaction}
           popupReaction={popupReaction}
           setPopupReaction={setPopupReaction}
           onPopupClick={handlePopupClick}
diff --git a/ts/components/conversation/message/message-content/MessageContextMenu.tsx b/ts/components/conversation/message/message-content/MessageContextMenu.tsx
index ec9b458506..407ee8220c 100644
--- a/ts/components/conversation/message/message-content/MessageContextMenu.tsx
+++ b/ts/components/conversation/message/message-content/MessageContextMenu.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-misused-promises */
 import React, { useCallback, useEffect, useRef, useState } from 'react';
 
 import { animation, Item, Menu, useContextMenu } from 'react-contexify';
@@ -200,7 +201,7 @@ const RetryItem = ({ messageId }: MessageId) => {
       await found.retrySend();
     }
   }, [messageId]);
-  return showRetry ? <Item onClick={() => void onRetry()}>{window.i18n('resend')}</Item> : null;
+  return showRetry ? <Item onClick={onRetry}>{window.i18n('resend')}</Item> : null;
 };
 
 export const MessageContextMenu = (props: Props) => {
@@ -349,7 +350,8 @@ export const MessageContextMenu = (props: Props) => {
         <StyledEmojiPanelContainer role="button" x={mouseX} y={mouseY}>
           <SessionEmojiPanel
             ref={emojiPanelRef}
-            onEmojiClicked={e => void onEmojiClick(e)}
+            // eslint-disable-next-line @typescript-eslint/no-misused-promises
+            onEmojiClicked={onEmojiClick}
             show={showEmojiPanel}
             isModal={true}
             onKeyDown={onEmojiKeyDown}
@@ -364,7 +366,8 @@ export const MessageContextMenu = (props: Props) => {
           animation={animation.fade}
         >
           {enableReactions && (
-            <MessageReactBar action={e => void onEmojiClick(e)} additionalAction={onShowEmoji} />
+            // eslint-disable-next-line @typescript-eslint/no-misused-promises
+            <MessageReactBar action={onEmojiClick} additionalAction={onShowEmoji} />
           )}
           <SaveAttachment messageId={messageId} />
 
@@ -373,7 +376,7 @@ export const MessageContextMenu = (props: Props) => {
             <Item onClick={onReply}>{window.i18n('replyToMessage')}</Item>
           )}
           {(!isPublic || isOutgoing) && (
-            <Item onClick={() => void onShowDetail()}>{window.i18n('moreInformation')}</Item>
+            <Item onClick={onShowDetail}>{window.i18n('moreInformation')}</Item>
           )}
           <RetryItem messageId={messageId} />
           {isDeletable ? <Item onClick={onSelect}>{selectMessageText}</Item> : null}
diff --git a/ts/components/conversation/message/message-content/MessageQuote.tsx b/ts/components/conversation/message/message-content/MessageQuote.tsx
index 054c9707cd..84ab7e0820 100644
--- a/ts/components/conversation/message/message-content/MessageQuote.tsx
+++ b/ts/components/conversation/message/message-content/MessageQuote.tsx
@@ -98,7 +98,8 @@ export const MessageQuote = (props: Props) => {
 
   return (
     <Quote
-      onClick={e => void onQuoteClick(e)}
+      // eslint-disable-next-line @typescript-eslint/no-misused-promises
+      onClick={onQuoteClick}
       text={quote?.text}
       attachment={quote?.attachment}
       isIncoming={direction === 'incoming'}
diff --git a/ts/components/dialog/EditProfileDialog.tsx b/ts/components/dialog/EditProfileDialog.tsx
index 32e4e2d8a0..a1d38b080a 100644
--- a/ts/components/dialog/EditProfileDialog.tsx
+++ b/ts/components/dialog/EditProfileDialog.tsx
@@ -163,7 +163,8 @@ export class EditProfileDialog extends React.Component<object, State> {
             <div
               className="image-upload-section"
               role="button"
-              onClick={() => void this.fireInputEvent()}
+              // eslint-disable-next-line @typescript-eslint/no-misused-promises
+              onClick={this.fireInputEvent}
               data-testid="image-upload-section"
             />
             <div
diff --git a/ts/components/leftpane/conversation-list-item/HeaderItem.tsx b/ts/components/leftpane/conversation-list-item/HeaderItem.tsx
index 6061382f7b..1f435bfb1f 100644
--- a/ts/components/leftpane/conversation-list-item/HeaderItem.tsx
+++ b/ts/components/leftpane/conversation-list-item/HeaderItem.tsx
@@ -148,7 +148,8 @@ const AtSymbol = ({ convoId }: { convoId: string }) => {
   return hasMentionedUs && hasUnread ? (
     <MentionAtSymbol
       title="Open to latest mention"
-      onMouseDown={e => void openConvoToLastMention(e, convoId)}
+      // eslint-disable-next-line @typescript-eslint/no-misused-promises
+      onMouseDown={async e => openConvoToLastMention(e, convoId)}
     >
       @
     </MentionAtSymbol>
diff --git a/ts/components/leftpane/overlay/OverlayCommunity.tsx b/ts/components/leftpane/overlay/OverlayCommunity.tsx
index f64d1b3fec..1b6080140f 100644
--- a/ts/components/leftpane/overlay/OverlayCommunity.tsx
+++ b/ts/components/leftpane/overlay/OverlayCommunity.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-misused-promises */
 import React, { useState } from 'react';
 import useKey from 'react-use/lib/useKey';
 import { useDispatch, useSelector } from 'react-redux';
@@ -86,7 +87,6 @@ export const OverlayCommunity = () => {
   return (
     <div className="module-left-pane-overlay">
       <OverlayHeader title={title} subtitle={subtitle} />
-
       <div className="create-group-name-input">
         <SessionIdEditable
           editable={true}
@@ -98,11 +98,9 @@ export const OverlayCommunity = () => {
           onPressEnter={onTryJoinRoom}
         />
       </div>
-
       <SessionButton text={buttonText} disabled={!groupUrl} onClick={onTryJoinRoom} />
-
       <SessionSpinner loading={loading} />
-      <SessionJoinableRooms onJoinClick={url => void onTryJoinRoom(url)} alreadyJoining={loading} />
+      <SessionJoinableRooms onJoinClick={onTryJoinRoom} alreadyJoining={loading} />
     </div>
   );
 };
diff --git a/ts/components/leftpane/overlay/choose-action/ContactRow.tsx b/ts/components/leftpane/overlay/choose-action/ContactRow.tsx
index 826d413520..be65ad6730 100644
--- a/ts/components/leftpane/overlay/choose-action/ContactRow.tsx
+++ b/ts/components/leftpane/overlay/choose-action/ContactRow.tsx
@@ -86,7 +86,8 @@ export const ContactRow = (props: Props) => {
   return (
     <StyledRowContainer
       style={style}
-      onClick={() => void openConversationWithMessages({ conversationKey: id, messageId: null })}
+      // eslint-disable-next-line @typescript-eslint/no-misused-promises
+      onClick={async () => openConversationWithMessages({ conversationKey: id, messageId: null })}
     >
       <AvatarItem id={id} displayName={displayName} />
       <StyledContactRowName data-testid="module-conversation__user__profile-name">
diff --git a/ts/components/menu/Menu.tsx b/ts/components/menu/Menu.tsx
index 80430bbce8..2164df87b7 100644
--- a/ts/components/menu/Menu.tsx
+++ b/ts/components/menu/Menu.tsx
@@ -357,7 +357,10 @@ export const MarkAllReadMenuItem = (): JSX.Element | null => {
   const isIncomingRequest = useIsIncomingRequest(convoId);
   if (!isIncomingRequest && !PubKey.isBlinded(convoId)) {
     return (
-      <Item onClick={() => void markAllReadByConvoId(convoId)}>{window.i18n('markAllAsRead')}</Item>
+      // eslint-disable-next-line @typescript-eslint/no-misused-promises
+      <Item onClick={async () => markAllReadByConvoId(convoId)}>
+        {window.i18n('markAllAsRead')}
+      </Item>
     );
   }
   return null;
@@ -379,8 +382,9 @@ export const BlockMenuItem = (): JSX.Element | null => {
   if (!isMe && isPrivate && !isIncomingRequest && !PubKey.isBlinded(convoId)) {
     const blockTitle = isBlocked ? window.i18n('unblock') : window.i18n('block');
     const blockHandler = isBlocked
-      ? () => void unblockConvoById(convoId)
-      : () => void blockConvoById(convoId);
+      ? async () => unblockConvoById(convoId)
+      : async () => blockConvoById(convoId);
+    // eslint-disable-next-line @typescript-eslint/no-misused-promises
     return <Item onClick={blockHandler}>{blockTitle}</Item>;
   }
   return null;
@@ -398,7 +402,10 @@ export const ClearNicknameMenuItem = (): JSX.Element | null => {
   }
 
   return (
-    <Item onClick={() => void clearNickNameByConvoId(convoId)}>{window.i18n('clearNickname')}</Item>
+    // eslint-disable-next-line @typescript-eslint/no-misused-promises
+    <Item onClick={async () => clearNickNameByConvoId(convoId)}>
+      {window.i18n('clearNickname')}
+    </Item>
   );
 };
 
diff --git a/ts/components/registration/SignUpTab.tsx b/ts/components/registration/SignUpTab.tsx
index 9a5f27ab8f..a54d0a01c3 100644
--- a/ts/components/registration/SignUpTab.tsx
+++ b/ts/components/registration/SignUpTab.tsx
@@ -7,6 +7,7 @@ import { RegistrationContext, RegistrationPhase, signUp } from './RegistrationSt
 import { RegistrationUserDetails } from './RegistrationUserDetails';
 import { sanitizeDisplayNameOrToast, SignInMode } from './SignInTab';
 import { TermsAndConditions } from './TermsAndConditions';
+import { Noop } from '../../types/Util';
 
 export enum SignUpMode {
   Default,
@@ -22,7 +23,7 @@ const ContinueSignUpButton = ({ continueSignUp }: { continueSignUp: any }) => {
   return <SessionButton onClick={continueSignUp} text={window.i18n('continue')} />;
 };
 
-const SignUpDefault = (props: { createSessionID: () => void }) => {
+const SignUpDefault = (props: { createSessionID: Noop }) => {
   return (
     <div className="session-registration__content">
       <CreateSessionIdButton createSessionID={props.createSessionID} />
@@ -46,7 +47,7 @@ export const GoBackMainMenuButton = () => {
   );
 };
 
-const SignUpSessionIDShown = (props: { continueSignUp: () => void }) => {
+const SignUpSessionIDShown = (props: { continueSignUp: Noop }) => {
   return (
     <div className="session-registration__content">
       <Flex flexDirection="row" container={true} alignItems="center">
diff --git a/ts/components/settings/SessionSettingListItem.tsx b/ts/components/settings/SessionSettingListItem.tsx
index c2b111b231..20311ff228 100644
--- a/ts/components/settings/SessionSettingListItem.tsx
+++ b/ts/components/settings/SessionSettingListItem.tsx
@@ -10,6 +10,7 @@ import {
 import { SessionToggle } from '../basic/SessionToggle';
 import { SessionConfirmDialogProps } from '../dialog/SessionConfirm';
 import { SessionIconButton } from '../icon';
+import { Noop } from '../../types/Util';
 
 type ButtonSettingsProps = {
   title?: string;
@@ -112,7 +113,7 @@ export const SessionSettingsItemWrapper = (props: {
   );
 };
 
-export const SessionSettingsTitleWithLink = (props: { title: string; onClick: () => void }) => {
+export const SessionSettingsTitleWithLink = (props: { title: string; onClick: Noop }) => {
   const { onClick, title } = props;
   return (
     <StyledSettingItemClickable onClick={onClick}>
diff --git a/ts/node/menu.ts b/ts/node/menu.ts
index 4c7573b3c6..fb2862e1ba 100644
--- a/ts/node/menu.ts
+++ b/ts/node/menu.ts
@@ -1,5 +1,6 @@
 import { isString } from 'lodash';
 import { LocaleMessagesType } from './locale';
+import { Noop } from '../types/Util';
 
 export const createTemplate = (
   options: {
@@ -162,7 +163,7 @@ export const createTemplate = (
 function updateForMac(
   template: any,
   messages: LocaleMessagesType,
-  options: { showAbout: () => void; showWindow: () => void }
+  options: { showAbout: Noop; showWindow: Noop }
 ) {
   const { showAbout, showWindow } = options;
 
diff --git a/ts/state/ducks/modalDialog.tsx b/ts/state/ducks/modalDialog.tsx
index 37053dcfcd..be1cb8b928 100644
--- a/ts/state/ducks/modalDialog.tsx
+++ b/ts/state/ducks/modalDialog.tsx
@@ -1,6 +1,7 @@
 import { createSlice, PayloadAction } from '@reduxjs/toolkit';
 import { SessionConfirmDialogProps } from '../../components/dialog/SessionConfirm';
 import { PasswordAction } from '../../components/dialog/SessionPasswordDialog';
+import { Noop } from '../../types/Util';
 
 export type BanType = 'ban' | 'unban';
 
@@ -22,7 +23,7 @@ export type OnionPathModalState = EditProfileModalState;
 export type RecoveryPhraseModalState = EditProfileModalState;
 export type DeleteAccountModalState = EditProfileModalState;
 
-export type SessionPasswordModalState = { passwordAction: PasswordAction; onOk: () => void } | null;
+export type SessionPasswordModalState = { passwordAction: PasswordAction; onOk: Noop } | null;
 
 export type UserDetailsModalState = {
   conversationId: string;
diff --git a/ts/types/Util.ts b/ts/types/Util.ts
index ccea6b792a..76f1d68008 100644
--- a/ts/types/Util.ts
+++ b/ts/types/Util.ts
@@ -7,3 +7,5 @@ export type RenderTextCallbackType = (options: {
 }) => JSX.Element;
 
 export type LocalizerType = (key: LocalizerKeys, values?: Array<string>) => string;
+
+export type Noop = () => void;
diff --git a/ts/util/expiringMessages.ts b/ts/util/expiringMessages.ts
index e7df1ba95f..5d64e282dc 100644
--- a/ts/util/expiringMessages.ts
+++ b/ts/util/expiringMessages.ts
@@ -98,7 +98,8 @@ async function checkExpiringMessages() {
   if (timeout) {
     global.clearTimeout(timeout);
   }
-  timeout = global.setTimeout(() => void destroyExpiredMessages(), wait);
+  // eslint-disable-next-line @typescript-eslint/no-misused-promises
+  timeout = global.setTimeout(async () => destroyExpiredMessages(), wait);
 }
 const throttledCheckExpiringMessages = throttle(checkExpiringMessages, 1000);
 
@@ -111,7 +112,8 @@ const initExpiringMessageListener = () => {
 
   void checkExpiringMessages();
 
-  initWallClockListener(() => void throttledCheckExpiringMessages());
+  // eslint-disable-next-line @typescript-eslint/no-misused-promises
+  initWallClockListener(async () => throttledCheckExpiringMessages());
   isInit = true;
 };
 

From 63228a97ee400269b485886a1a6cce73788b4649 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Sat, 5 Aug 2023 16:18:05 +1000
Subject: [PATCH 7/8] chore: update pbjs package and make integration test more
 reliable

---
 package.json                                  |   5 +-
 ts/test/automation/create_user.spec.ts        |   1 +
 ts/test/automation/linked_device_user.spec.ts |  12 +-
 ts/test/automation/setup/new_user.ts          |   3 +-
 ts/test/automation/utilities/utils.ts         |  31 ++
 yarn.lock                                     | 276 +++++++++++++++---
 6 files changed, 282 insertions(+), 46 deletions(-)

diff --git a/package.json b/package.json
index 31c6c0d6e4..ac0e63e8f5 100644
--- a/package.json
+++ b/package.json
@@ -107,7 +107,7 @@
     "os-locale": "5.0.0",
     "p-retry": "^4.2.0",
     "pify": "3.0.0",
-    "protobufjs": "^6.11.2",
+    "protobufjs": "^7.2.4",
     "rc-slider": "^10.2.1",
     "react": "^17.0.2",
     "react-contexify": "5.0.0",
@@ -128,7 +128,7 @@
     "redux-promise-middleware": "^6.1.2",
     "rimraf": "2.6.2",
     "sanitize.css": "^12.0.1",
-    "semver": "5.4.1",
+    "semver": "^7.5.4",
     "styled-components": "5.1.1",
     "uuid": "8.3.2",
     "webrtc-adapter": "^4.1.1"
@@ -194,6 +194,7 @@
     "playwright": "1.16.3",
     "postinstall-prepare": "^1.0.1",
     "prettier": "1.19.0",
+    "protobufjs-cli": "^1.1.1",
     "run-script-os": "^1.1.6",
     "sass": "^1.60.0",
     "sass-loader": "^13.2.2",
diff --git a/ts/test/automation/create_user.spec.ts b/ts/test/automation/create_user.spec.ts
index 6829b93cda..4a74c9a383 100644
--- a/ts/test/automation/create_user.spec.ts
+++ b/ts/test/automation/create_user.spec.ts
@@ -17,6 +17,7 @@ sessionTestOneWindow('Create User', async ([window]) => {
   await waitForTestIdWithText(window, 'your-profile-name', userA.userName);
   // check session id matches
   await waitForTestIdWithText(window, 'your-session-id', userA.sessionid);
+
   // exit profile module
   await window.click('.session-icon-button.small');
   // go to settings section
diff --git a/ts/test/automation/linked_device_user.spec.ts b/ts/test/automation/linked_device_user.spec.ts
index 5ccec8f8cd..3b44d92f2e 100644
--- a/ts/test/automation/linked_device_user.spec.ts
+++ b/ts/test/automation/linked_device_user.spec.ts
@@ -12,6 +12,7 @@ import {
   clickOnTestIdWithText,
   hasTextElementBeenDeleted,
   typeIntoInput,
+  waitForMatchingPlaceholder,
   waitForMatchingText,
   waitForTestIdWithText,
   waitForTextMessage,
@@ -161,7 +162,16 @@ test('Check blocked user syncs', async () => {
   await clickOnElement(windowA, 'data-testid', 'three-dots-conversation-options');
   await clickOnMatchingText(windowA, 'Block');
   await waitForTestIdWithText(windowA, 'session-toast', 'Blocked');
-  // await waitForMatchingText(windowA, 'Unblock this contact to send a message.');
+  await waitForMatchingPlaceholder(
+    windowA,
+    'message-input-text-area',
+    'Unblock this contact to send a message.'
+  );
+  await waitForMatchingPlaceholder(
+    windowB,
+    'message-input-text-area',
+    'Unblock this contact to send a message.'
+  ); // reveal-blocked-user-settings is not updated once opened
   // Check linked device for blocked contact in settings screen
   await clickOnTestIdWithText(windowB, 'settings-section');
   await clickOnTestIdWithText(windowB, 'conversations-settings-menu-item');
diff --git a/ts/test/automation/setup/new_user.ts b/ts/test/automation/setup/new_user.ts
index 99816bf34e..4e9d8e0973 100644
--- a/ts/test/automation/setup/new_user.ts
+++ b/ts/test/automation/setup/new_user.ts
@@ -17,7 +17,8 @@ export const newUser = async (window: Page, userName: string): Promise<User> =>
   await clickOnTestIdWithText(window, 'leftpane-primary-avatar');
 
   // Save session ID to a variable
-  const sessionid = await window.innerText('[data-testid=your-session-id]');
+  let sessionid = await window.innerText('[data-testid=your-session-id]');
+  sessionid = sessionid.replace(/(\r\n|\n|\r)/gm, ''); // remove the new line in the SessionID as it is rendered with one forced
 
   console.info(`${userName}: Session ID: ${sessionid} and Recovery phrase: ${recoveryPhrase}`);
   await window.click('.session-icon-button.small');
diff --git a/ts/test/automation/utilities/utils.ts b/ts/test/automation/utilities/utils.ts
index 9b0968fa9a..a3425bf319 100644
--- a/ts/test/automation/utilities/utils.ts
+++ b/ts/test/automation/utilities/utils.ts
@@ -68,6 +68,37 @@ export async function waitForMatchingText(window: Page, text: string, maxWait?:
   console.info(`got matchingText: ${text}`);
 }
 
+export async function waitForMatchingPlaceholder(
+  window: Page,
+  dataTestId: string,
+  placeholder: string,
+  maxWait: number = 30000
+) {
+  let found = false;
+  const start = Date.now();
+  console.info(`waitForMatchingPlaceholder: ${placeholder} with datatestId: ${dataTestId}`);
+
+  do {
+    try {
+      const elem = await waitForElement(window, 'data-testid', dataTestId);
+      const elemPlaceholder = await elem.getAttribute('placeholder');
+      if (elemPlaceholder === placeholder) {
+        console.info(
+          `waitForMatchingPlaceholder foudn matching element with placeholder: "${placeholder}"`
+        );
+
+        found = true;
+      }
+    } catch (e) {
+      await sleepFor(1000, true);
+      console.info(`waitForMatchingPlaceholder failed with ${e.message}, retrying in 1s`);
+    }
+  } while (!found && Date.now() - start <= maxWait);
+
+  if (!found) {
+    throw new Error(`Failed to find datatestid:"${dataTestId}" with placeholder: "${placeholder}"`);
+  }
+}
 export async function waitForLoadingAnimationToFinish(
   window: Page,
   loader: loaderType,
diff --git a/yarn.lock b/yarn.lock
index 116c6d2610..298e95cc9a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -216,7 +216,7 @@
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
-"@babel/parser@^7.22.5", "@babel/parser@^7.22.7":
+"@babel/parser@^7.20.15", "@babel/parser@^7.22.5", "@babel/parser@^7.22.7":
   version "7.22.7"
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.22.7.tgz#df8cf085ce92ddbdbf668a7f186ce848c9036cae"
   integrity sha512-7NF8pOkHP5o2vpmGgNGcfAeCvOYhGLyA3Z4eBQkT1RJlWu47n63bCs93QfJ2hIAFCil7L5P2IWhs1oToVgrL0Q==
@@ -664,6 +664,13 @@
     "@jridgewell/resolve-uri" "3.1.0"
     "@jridgewell/sourcemap-codec" "1.4.14"
 
+"@jsdoc/salty@^0.2.1":
+  version "0.2.5"
+  resolved "https://registry.yarnpkg.com/@jsdoc/salty/-/salty-0.2.5.tgz#1b2fa5bb8c66485b536d86eee877c263d322f692"
+  integrity sha512-TfRP53RqunNe2HBobVBJ0VLhK1HbfvBYeTC1ahnN64PWvyYyGebmMiPkuwvD9fpw2ZbkoPb8Q7mwy0aR8Z9rvw==
+  dependencies:
+    lodash "^4.17.21"
+
 "@malept/cross-spawn-promise@^1.1.0":
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/@malept/cross-spawn-promise/-/cross-spawn-promise-1.1.1.tgz#504af200af6b98e198bce768bc1730c6936ae01d"
@@ -1094,7 +1101,7 @@
   resolved "https://registry.yarnpkg.com/@types/libsodium-wrappers/-/libsodium-wrappers-0.7.10.tgz#a6ebde70d3b4af960fd802af8d0e3c7cfe281eb2"
   integrity sha512-BqI9B92u+cM3ccp8mpHf+HzJ8fBlRwdmyd6+fz3p99m3V6ifT5O3zmOMi612PGkpeFeG/G6loxUnzlDNhfjPSA==
 
-"@types/linkify-it@^3.0.2":
+"@types/linkify-it@*", "@types/linkify-it@^3.0.2":
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/@types/linkify-it/-/linkify-it-3.0.2.tgz#fd2cd2edbaa7eaac7e7f3c1748b52a19143846c9"
   integrity sha512-HZQYqbiFVWufzCwexrvh694SOim8z2d+xJl5UNamcvQFejLY/2YUtzXHYi3cHdI7PMlS8ejH2slRAOJQ32aNbA==
@@ -1109,10 +1116,18 @@
   resolved "https://registry.yarnpkg.com/@types/long/-/long-3.0.32.tgz#f4e5af31e9e9b196d8e5fca8a5e2e20aa3d60b69"
   integrity sha512-ZXyOOm83p7X8p3s0IYM3VeueNmHpkk/yMlP8CLeOnEcu6hIwPH7YjZBvhQkR0ZFS2DqZAxKtJ/M5fcuv3OU5BA==
 
-"@types/long@^4.0.1":
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/@types/long/-/long-4.0.2.tgz#b74129719fc8d11c01868010082d483b7545591a"
-  integrity sha512-MqTGEo5bj5t157U6fA/BiDynNkn0YknVdh48CMPkTSpFTVmvao5UQmm7uEF6xBEo7qIMAlY/JSleYaE6VOdpaA==
+"@types/markdown-it@^12.2.3":
+  version "12.2.3"
+  resolved "https://registry.yarnpkg.com/@types/markdown-it/-/markdown-it-12.2.3.tgz#0d6f6e5e413f8daaa26522904597be3d6cd93b51"
+  integrity sha512-GKMHFfv3458yYy+v/N8gjufHO6MSZKCOXpZc5GXIWWy8uldwfmPn98vp81gZ5f9SVw8YYBctgfJ22a2d7AOMeQ==
+  dependencies:
+    "@types/linkify-it" "*"
+    "@types/mdurl" "*"
+
+"@types/mdurl@*":
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/@types/mdurl/-/mdurl-1.0.2.tgz#e2ce9d83a613bacf284c7be7d491945e39e1f8e9"
+  integrity sha512-eC4U9MlIcu2q0KQmXszyn5Akca/0jrQmwDRgpAMJai7qBWq4amIQhZyNau4VYGtCeALvW1/NtjzJJ567aZxfKA==
 
 "@types/minimatch@*", "@types/minimatch@^5.1.2":
   version "5.1.2"
@@ -1197,15 +1212,7 @@
     "@types/prop-types" "*"
     "@types/react" "*"
 
-"@types/react@*", "@types/react@17.0.2", "@types/react@^17":
-  version "17.0.2"
-  resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.2.tgz#3de24c4efef902dd9795a49c75f760cbe4f7a5a8"
-  integrity sha512-Xt40xQsrkdvjn1EyWe1Bc0dJLcil/9x2vAuW7ya+PuQip4UYUaXyhzWmAbwRsdMgwOFHpfp7/FFZebDU6Y8VHA==
-  dependencies:
-    "@types/prop-types" "*"
-    csstype "^3.0.2"
-
-"@types/react@^17.0.2":
+"@types/react@*", "@types/react@^17", "@types/react@^17.0.2":
   version "17.0.62"
   resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.62.tgz#2efe8ddf8533500ec44b1334dd1a97caa2f860e3"
   integrity sha512-eANCyz9DG8p/Vdhr0ZKST8JV12PhH2ACCDYlFw6DIO+D+ca+uP4jtEDEpVqXZrh/uZdXQGwk7whJa3ah5DtyLw==
@@ -1214,6 +1221,14 @@
     "@types/scheduler" "*"
     csstype "^3.0.2"
 
+"@types/react@17.0.2":
+  version "17.0.2"
+  resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.2.tgz#3de24c4efef902dd9795a49c75f760cbe4f7a5a8"
+  integrity sha512-Xt40xQsrkdvjn1EyWe1Bc0dJLcil/9x2vAuW7ya+PuQip4UYUaXyhzWmAbwRsdMgwOFHpfp7/FFZebDU6Y8VHA==
+  dependencies:
+    "@types/prop-types" "*"
+    csstype "^3.0.2"
+
 "@types/redux-logger@3.0.7":
   version "3.0.7"
   resolved "https://registry.yarnpkg.com/@types/redux-logger/-/redux-logger-3.0.7.tgz#163f6f6865c69c21d56f9356dc8d741718ec0db0"
@@ -2017,7 +2032,7 @@ bluebird-lst@^1.0.9:
   dependencies:
     bluebird "^3.5.5"
 
-bluebird@^3.5.0, bluebird@^3.5.5:
+bluebird@^3.5.0, bluebird@^3.5.5, bluebird@^3.7.2:
   version "3.7.2"
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
   integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==
@@ -2250,6 +2265,13 @@ caniuse-lite@^1.0.30001517:
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001518.tgz#b3ca93904cb4699c01218246c4d77a71dbe97150"
   integrity sha512-rup09/e3I0BKjncL+FesTayKtPrdwKhUufQFd3riFw1hHg8JmIFoInYfB102cFcY/pPgGmdyl/iy+jgiDi2vdA==
 
+catharsis@^0.9.0:
+  version "0.9.0"
+  resolved "https://registry.yarnpkg.com/catharsis/-/catharsis-0.9.0.tgz#40382a168be0e6da308c277d3a2b3eb40c7d2121"
+  integrity sha512-prMTQVpcns/tzFgFVkVp6ak6RykZyWb3gu8ckUpd6YkTlacOd3DXGJjIpD4Q6zJirizvaiAjSSHlOsA+6sNh2A==
+  dependencies:
+    lodash "^4.17.15"
+
 chai-as-promised@^7.1.1:
   version "7.1.1"
   resolved "https://registry.yarnpkg.com/chai-as-promised/-/chai-as-promised-7.1.1.tgz#08645d825deb8696ee61725dbf590c012eb00ca0"
@@ -2736,7 +2758,7 @@ deep-extend@^0.6.0:
   resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac"
   integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==
 
-deep-is@^0.1.3:
+deep-is@^0.1.3, deep-is@~0.1.3:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831"
   integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==
@@ -2985,9 +3007,9 @@ electron-publish@23.6.0:
     mime "^2.5.2"
 
 electron-to-chromium@^1.4.477:
-  version "1.4.479"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.479.tgz#ec9f676f23d3a0b0e429bc454d25e0b3253d2118"
-  integrity sha512-ABv1nHMIR8I5n3O3Een0gr6i0mfM+YcTZqjHy3pAYaOjgFG+BMquuKrSyfYf5CbEkLr9uM05RA3pOk4udNB/aQ==
+  version "1.4.480"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.480.tgz#40e32849ca50bc23ce29c1516c5adb3fddac919d"
+  integrity sha512-IXTgg+bITkQv/FLP9FjX6f9KFCs5hQWeh5uNSKxB9mqYj/JXhHDbu+ekS43LVvbkL3eW6/oZy4+r9Om6lan1Uw==
 
 electron-updater@^4.2.2:
   version "4.6.5"
@@ -3063,6 +3085,11 @@ entities@^4.4.0:
   resolved "https://registry.yarnpkg.com/entities/-/entities-4.5.0.tgz#5d268ea5e7113ec74c4d033b79ea5a35a488fb48"
   integrity sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==
 
+entities@~2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/entities/-/entities-2.1.0.tgz#992d3129cf7df6870b96c57858c249a120f8b8b5"
+  integrity sha512-hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w==
+
 env-paths@^2.2.0:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.1.tgz#420399d416ce1fbe9bc0a07c62fa68d67fd0f8f2"
@@ -3190,6 +3217,18 @@ escape-string-regexp@^2.0.0:
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz#a30304e99daa32e23b2fd20f51babd07cffca344"
   integrity sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==
 
+escodegen@^1.13.0:
+  version "1.14.3"
+  resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.14.3.tgz#4e7b81fba61581dc97582ed78cab7f0e8d63f503"
+  integrity sha512-qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw==
+  dependencies:
+    esprima "^4.0.1"
+    estraverse "^4.2.0"
+    esutils "^2.0.2"
+    optionator "^0.8.1"
+  optionalDependencies:
+    source-map "~0.6.1"
+
 eslint-config-airbnb-base@^15.0.0:
   version "15.0.0"
   resolved "https://registry.yarnpkg.com/eslint-config-airbnb-base/-/eslint-config-airbnb-base-15.0.0.tgz#6b09add90ac79c2f8d723a2580e07f3925afd236"
@@ -3360,7 +3399,7 @@ eslint@^8.45.0:
     strip-ansi "^6.0.1"
     text-table "^0.2.0"
 
-espree@^9.6.0, espree@^9.6.1:
+espree@^9.0.0, espree@^9.6.0, espree@^9.6.1:
   version "9.6.1"
   resolved "https://registry.yarnpkg.com/espree/-/espree-9.6.1.tgz#a2a17b8e434690a5432f2f8018ce71d331a48c6f"
   integrity sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==
@@ -3369,6 +3408,11 @@ espree@^9.6.0, espree@^9.6.1:
     acorn-jsx "^5.3.2"
     eslint-visitor-keys "^3.4.1"
 
+esprima@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
+  integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
+
 esquery@^1.4.2:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.5.0.tgz#6ce17738de8577694edd7361c57182ac8cb0db0b"
@@ -3383,7 +3427,7 @@ esrecurse@^4.3.0:
   dependencies:
     estraverse "^5.2.0"
 
-estraverse@^4.1.1:
+estraverse@^4.1.1, estraverse@^4.2.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d"
   integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==
@@ -3472,7 +3516,7 @@ fast-json-stable-stringify@^2.0.0:
   resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633"
   integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==
 
-fast-levenshtein@^2.0.6:
+fast-levenshtein@^2.0.6, fast-levenshtein@~2.0.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
   integrity sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==
@@ -3824,6 +3868,17 @@ glob@^7.0.5, glob@^7.1.3, glob@^7.1.6:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
+glob@^8.0.0:
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-8.1.0.tgz#d388f656593ef708ee3e34640fdfb99a9fd1c33e"
+  integrity sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==
+  dependencies:
+    fs.realpath "^1.0.0"
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "^5.0.1"
+    once "^1.3.0"
+
 global-agent@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/global-agent/-/global-agent-3.0.0.tgz#ae7cd31bd3583b93c5a16437a1afe27cc33a1ab6"
@@ -3898,7 +3953,7 @@ got@^11.8.5, got@^9.6.0:
     p-cancelable "^2.0.0"
     responselike "^2.0.0"
 
-graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4, graceful-fs@^4.2.9:
+graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.1.9, graceful-fs@^4.2.0, graceful-fs@^4.2.4, graceful-fs@^4.2.9:
   version "4.2.11"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3"
   integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==
@@ -4527,6 +4582,34 @@ js-yaml@4.1.0, js-yaml@^4.1.0:
   dependencies:
     argparse "^2.0.1"
 
+js2xmlparser@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/js2xmlparser/-/js2xmlparser-4.0.2.tgz#2a1fdf01e90585ef2ae872a01bc169c6a8d5e60a"
+  integrity sha512-6n4D8gLlLf1n5mNLQPRfViYzu9RATblzPEtm1SthMX1Pjao0r9YI9nw7ZIfRxQMERS87mcswrg+r/OYrPRX6jA==
+  dependencies:
+    xmlcreate "^2.0.4"
+
+jsdoc@^4.0.0:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/jsdoc/-/jsdoc-4.0.2.tgz#a1273beba964cf433ddf7a70c23fd02c3c60296e"
+  integrity sha512-e8cIg2z62InH7azBBi3EsSEqrKx+nUtAS5bBcYTSpZFA+vhNPyhv8PTFZ0WsjOPDj04/dOLlm08EDcQJDqaGQg==
+  dependencies:
+    "@babel/parser" "^7.20.15"
+    "@jsdoc/salty" "^0.2.1"
+    "@types/markdown-it" "^12.2.3"
+    bluebird "^3.7.2"
+    catharsis "^0.9.0"
+    escape-string-regexp "^2.0.0"
+    js2xmlparser "^4.0.2"
+    klaw "^3.0.0"
+    markdown-it "^12.3.2"
+    markdown-it-anchor "^8.4.1"
+    marked "^4.0.10"
+    mkdirp "^1.0.4"
+    requizzle "^0.2.3"
+    strip-json-comments "^3.1.0"
+    underscore "~1.13.2"
+
 jsdom-global@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/jsdom-global/-/jsdom-global-3.0.2.tgz#6bd299c13b0c4626b2da2c0393cd4385d606acb9"
@@ -4661,6 +4744,13 @@ klaw-sync@^6.0.0:
   dependencies:
     graceful-fs "^4.1.11"
 
+klaw@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/klaw/-/klaw-3.0.0.tgz#b11bec9cf2492f06756d6e809ab73a2910259146"
+  integrity sha512-0Fo5oir+O9jnXu5EefYbVK+mHMBeEVEy2cmctR1O1NECcCkPRreJKrS6Qt/j3KC2C148Dfo9i3pCmCMsdqGr0g==
+  dependencies:
+    graceful-fs "^4.1.9"
+
 lamejs@^1.2.0:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/lamejs/-/lamejs-1.2.1.tgz#0f92d38729213f106d4a19ded20821da7e89c8e4"
@@ -4695,6 +4785,14 @@ levn@^0.4.1:
     prelude-ls "^1.2.1"
     type-check "~0.4.0"
 
+levn@~0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
+  integrity sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA==
+  dependencies:
+    prelude-ls "~1.1.2"
+    type-check "~0.3.2"
+
 "libsession_util_nodejs@https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.2.5/libsession_util_nodejs-v0.2.5.tar.gz":
   version "0.2.5"
   resolved "https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.2.5/libsession_util_nodejs-v0.2.5.tar.gz#e1db928eaca58f22c66494c6179e13bdd4e38cd4"
@@ -4714,6 +4812,13 @@ libsodium-wrappers-sumo@^0.7.9:
   dependencies:
     libsodium-sumo "^0.7.11"
 
+linkify-it@^3.0.1:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/linkify-it/-/linkify-it-3.0.3.tgz#a98baf44ce45a550efb4d49c769d07524cc2fa2e"
+  integrity sha512-ynTsyrFSdE5oZ/O9GEf00kPngmOfVwazR5GKDq6EYfhlpFug3J2zybX56a2PRRpc9P+FuSoGNAwjlbDs9jJBPQ==
+  dependencies:
+    uc.micro "^1.0.1"
+
 linkify-it@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/linkify-it/-/linkify-it-4.0.1.tgz#01f1d5e508190d06669982ba31a7d9f56a5751ec"
@@ -4797,6 +4902,11 @@ long@^4.0.0:
   resolved "https://registry.yarnpkg.com/long/-/long-4.0.0.tgz#9a7b71cfb7d361a194ea555241c92f7468d5bf28"
   integrity sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA==
 
+long@^5.0.0:
+  version "5.2.3"
+  resolved "https://registry.yarnpkg.com/long/-/long-5.2.3.tgz#a3ba97f3877cf1d778eccbcb048525ebb77499e1"
+  integrity sha512-lcHwpNoggQTObv5apGNCTdJrO69eHOZMi4BNC+rTLER8iHAqGrUVeLh/irVIM7zTw2bOXA8T6uNPeujwOLg/2Q==
+
 long@~3:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/long/-/long-3.2.0.tgz#d821b7138ca1cb581c172990ef14db200b5c474b"
@@ -4849,6 +4959,27 @@ map-age-cleaner@^0.1.3:
   dependencies:
     p-defer "^1.0.0"
 
+markdown-it-anchor@^8.4.1:
+  version "8.6.7"
+  resolved "https://registry.yarnpkg.com/markdown-it-anchor/-/markdown-it-anchor-8.6.7.tgz#ee6926daf3ad1ed5e4e3968b1740eef1c6399634"
+  integrity sha512-FlCHFwNnutLgVTflOYHPW2pPcl2AACqVzExlkGQNsi4CJgqOHN7YTgDd4LuhgN1BFO3TS0vLAruV1Td6dwWPJA==
+
+markdown-it@^12.3.2:
+  version "12.3.2"
+  resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-12.3.2.tgz#bf92ac92283fe983fe4de8ff8abfb5ad72cd0c90"
+  integrity sha512-TchMembfxfNVpHkbtriWltGWc+m3xszaRD0CZup7GFFhzIgQqxIfn3eGj1yZpfuflzPvfkt611B2Q/Bsk1YnGg==
+  dependencies:
+    argparse "^2.0.1"
+    entities "~2.1.0"
+    linkify-it "^3.0.1"
+    mdurl "^1.0.1"
+    uc.micro "^1.0.5"
+
+marked@^4.0.10:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/marked/-/marked-4.3.0.tgz#796362821b019f734054582038b116481b456cf3"
+  integrity sha512-PRsaiG84bK+AMvxziE/lCFss8juXjNaWzVbN5tXAm4XjeaS9NAHhop+PjQxz2A9h8Q4M/xGmzP8vqNwy6JeK0A==
+
 matcher@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/matcher/-/matcher-3.0.0.tgz#bd9060f4c5b70aa8041ccc6f80368760994f30ca"
@@ -4861,6 +4992,11 @@ mdn-data@2.0.14:
   resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.14.tgz#7113fc4281917d63ce29b43446f701e68c25ba50"
   integrity sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==
 
+mdurl@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/mdurl/-/mdurl-1.0.1.tgz#fe85b2ec75a59037f2adfec100fd6c601761152e"
+  integrity sha512-/sKlQJCBYVY9Ers9hqzKou4H6V5UWc/M59TH2dvkt+84itfnq7uFOMLpOiOS4ujvHP4etln18fmIxA5R5fll0g==
+
 mem@^5.0.0:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/mem/-/mem-5.1.1.tgz#7059b67bf9ac2c924c9f1cff7155a064394adfb3"
@@ -4973,7 +5109,7 @@ minizlib@^2.1.1:
     minipass "^3.0.0"
     yallist "^4.0.0"
 
-mkdirp@^1.0.3:
+mkdirp@^1.0.3, mkdirp@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
   integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
@@ -5274,6 +5410,18 @@ open@^8.3.0:
     is-docker "^2.1.1"
     is-wsl "^2.2.0"
 
+optionator@^0.8.1:
+  version "0.8.3"
+  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495"
+  integrity sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==
+  dependencies:
+    deep-is "~0.1.3"
+    fast-levenshtein "~2.0.6"
+    levn "~0.3.0"
+    prelude-ls "~1.1.2"
+    type-check "~0.3.2"
+    word-wrap "~1.2.3"
+
 optionator@^0.9.3:
   version "0.9.3"
   resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.3.tgz#007397d44ed1872fdc6ed31360190f81814e2c64"
@@ -5594,6 +5742,11 @@ prelude-ls@^1.2.1:
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396"
   integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==
 
+prelude-ls@~1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
+  integrity sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w==
+
 prettier@1.19.0:
   version "1.19.0"
   resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.19.0.tgz#3bec4489d5eebcd52b95ddd2c22467b5c852fde1"
@@ -5639,10 +5792,26 @@ proper-lockfile@^4.1.1:
     retry "^0.12.0"
     signal-exit "^3.0.2"
 
-protobufjs@^6.11.2:
-  version "6.11.3"
-  resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-6.11.3.tgz#637a527205a35caa4f3e2a9a4a13ddffe0e7af74"
-  integrity sha512-xL96WDdCZYdU7Slin569tFX712BxsxslWwAfAhCYjQKGTq7dAU91Lomy6nLLhh/dyGhk/YH4TwTSRxTzhuHyZg==
+protobufjs-cli@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/protobufjs-cli/-/protobufjs-cli-1.1.1.tgz#f531201b1c8c7772066aa822bf9a08318b24a704"
+  integrity sha512-VPWMgIcRNyQwWUv8OLPyGQ/0lQY/QTQAVN5fh+XzfDwsVw1FZ2L3DM/bcBf8WPiRz2tNpaov9lPZfNcmNo6LXA==
+  dependencies:
+    chalk "^4.0.0"
+    escodegen "^1.13.0"
+    espree "^9.0.0"
+    estraverse "^5.1.0"
+    glob "^8.0.0"
+    jsdoc "^4.0.0"
+    minimist "^1.2.0"
+    semver "^7.1.2"
+    tmp "^0.2.1"
+    uglify-js "^3.7.7"
+
+protobufjs@^7.2.4:
+  version "7.2.4"
+  resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-7.2.4.tgz#3fc1ec0cdc89dd91aef9ba6037ba07408485c3ae"
+  integrity sha512-AT+RJgD2sH8phPmCf7OUZR8xGdcJRga4+1cOaXJ64hvcSkVhNcRHOwIxUatPH15+nj59WAGTDv3LSGZPEQbJaQ==
   dependencies:
     "@protobufjs/aspromise" "^1.1.2"
     "@protobufjs/base64" "^1.1.2"
@@ -5654,9 +5823,8 @@ protobufjs@^6.11.2:
     "@protobufjs/path" "^1.1.2"
     "@protobufjs/pool" "^1.1.0"
     "@protobufjs/utf8" "^1.1.0"
-    "@types/long" "^4.0.1"
     "@types/node" ">=13.7.0"
-    long "^4.0.0"
+    long "^5.0.0"
 
 proxy-from-env@^1.1.0:
   version "1.1.0"
@@ -6027,6 +6195,13 @@ requires-port@^1.0.0:
   resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
   integrity sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==
 
+requizzle@^0.2.3:
+  version "0.2.4"
+  resolved "https://registry.yarnpkg.com/requizzle/-/requizzle-0.2.4.tgz#319eb658b28c370f0c20f968fa8ceab98c13d27c"
+  integrity sha512-JRrFk1D4OQ4SqovXOgdav+K8EAhSB/LJZqCz8tbX0KObcdeM15Ss59ozWMBWmmINMagCwmqn4ZNryUGpBsl6Jw==
+  dependencies:
+    lodash "^4.17.21"
+
 reselect@^4.1.5:
   version "4.1.8"
   resolved "https://registry.yarnpkg.com/reselect/-/reselect-4.1.8.tgz#3f5dc671ea168dccdeb3e141236f69f02eaec524"
@@ -6286,11 +6461,6 @@ semver-diff@^3.1.1:
   dependencies:
     semver "^6.3.0"
 
-semver@5.4.1:
-  version "5.4.1"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.4.1.tgz#e059c09d8571f0540823733433505d3a2f00b18e"
-  integrity sha512-WfG/X9+oATh81XtllIo/I8gOiY9EXRdv1cQdyykeXK17YcUW3EXUAi2To4pcH6nZtJPr7ZOpM5OMyWJZm+8Rsg==
-
 semver@^5.5.0, semver@^5.6.0:
   version "5.7.2"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.2.tgz#48d55db737c3287cd4835e17fa13feace1c41ef8"
@@ -6301,7 +6471,7 @@ semver@^6.0.0, semver@^6.2.0, semver@^6.3.0, semver@^6.3.1:
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
   integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
 
-semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7, semver@^7.3.8, semver@^7.5.4:
+semver@^7.1.2, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7, semver@^7.3.8, semver@^7.5.4:
   version "7.5.4"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e"
   integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==
@@ -6473,7 +6643,7 @@ source-map@^0.5.6:
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
   integrity sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==
 
-source-map@^0.6.0, source-map@^0.6.1:
+source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
   integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
@@ -6610,7 +6780,7 @@ strip-final-newline@^2.0.0:
   resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad"
   integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==
 
-strip-json-comments@3.1.1, strip-json-comments@^3.1.1:
+strip-json-comments@3.1.1, strip-json-comments@^3.1.0, strip-json-comments@^3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
   integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==
@@ -6767,7 +6937,7 @@ tmp@^0.0.33:
   dependencies:
     os-tmpdir "~1.0.2"
 
-tmp@^0.2.0:
+tmp@^0.2.0, tmp@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.2.1.tgz#8457fc3037dcf4719c251367a1af6500ee1ccf14"
   integrity sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==
@@ -6862,6 +7032,13 @@ type-check@^0.4.0, type-check@~0.4.0:
   dependencies:
     prelude-ls "^1.2.1"
 
+type-check@~0.3.2:
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72"
+  integrity sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==
+  dependencies:
+    prelude-ls "~1.1.2"
+
 type-detect@4.0.8, type-detect@^4.0.0, type-detect@^4.0.5, type-detect@^4.0.8:
   version "4.0.8"
   resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz#7646fb5f18871cfbb7749e69bd39a6388eb7450c"
@@ -6928,11 +7105,16 @@ typescript@^5.1.6:
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.1.6.tgz#02f8ac202b6dad2c0dd5e0913745b47a37998274"
   integrity sha512-zaWCozRZ6DLEWAWFrVDz1H6FVXzUSfTy5FUMWsQlU8Ym5JP9eO4xkTIROFCQvhQf61z6O/G6ugw3SgAnvvm+HA==
 
-uc.micro@^1.0.1:
+uc.micro@^1.0.1, uc.micro@^1.0.5:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/uc.micro/-/uc.micro-1.0.6.tgz#9c411a802a409a91fc6cf74081baba34b24499ac"
   integrity sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==
 
+uglify-js@^3.7.7:
+  version "3.17.4"
+  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.17.4.tgz#61678cf5fa3f5b7eb789bb345df29afb8257c22c"
+  integrity sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==
+
 unbox-primitive@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.2.tgz#29032021057d5e6cdbd08c5129c226dff8ed6f9e"
@@ -6943,7 +7125,7 @@ unbox-primitive@^1.0.2:
     has-symbols "^1.0.3"
     which-boxed-primitive "^1.0.2"
 
-underscore@>=1.8.3:
+underscore@>=1.8.3, underscore@~1.13.2:
   version "1.13.6"
   resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.13.6.tgz#04786a1f589dc6c09f761fc5f45b89e935136441"
   integrity sha512-+A5Sja4HP1M08MaXya7p5LvjuM7K6q/2EaC0+iovj/wOcMsTzMvDFbasi/oSapiwOlt252IqsKqPjCl7huKS0A==
@@ -7234,6 +7416,11 @@ wildcard@^2.0.0:
   resolved "https://registry.yarnpkg.com/wildcard/-/wildcard-2.0.1.tgz#5ab10d02487198954836b6349f74fff961e10f67"
   integrity sha512-CC1bOL87PIWSBhDcTrdeLo6eGT7mCFtrg0uIJtqJUFyK+eJnzl8A1niH56uu7KMa5XFrtiV+AQuHO3n7DsHnLQ==
 
+word-wrap@~1.2.3:
+  version "1.2.5"
+  resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.5.tgz#d2c45c6dd4fbce621a66f136cbe328afd0410b34"
+  integrity sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==
+
 workerpool@6.2.1:
   version "6.2.1"
   resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.2.1.tgz#46fc150c17d826b86a008e5a4508656777e9c343"
@@ -7293,6 +7480,11 @@ xmlchars@^2.2.0:
   resolved "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.2.0.tgz#060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb"
   integrity sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==
 
+xmlcreate@^2.0.4:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/xmlcreate/-/xmlcreate-2.0.4.tgz#0c5ab0f99cdd02a81065fa9cd8f8ae87624889be"
+  integrity sha512-nquOebG4sngPmGPICTS5EnxqhKbCmz5Ox5hsszI2T6U5qdrJizBc+0ilYSEjTSzU0yZcmvppztXe/5Al5fUwdg==
+
 y18n@^5.0.5:
   version "5.0.8"
   resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55"

From a23f53286ea486685beb27aa060a286a0909de99 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Sat, 5 Aug 2023 17:52:38 +1000
Subject: [PATCH 8/8] fix: typing bubble relates to current conversation, not
 selected one

---
 ts/components/conversation/TypingBubble.tsx | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/ts/components/conversation/TypingBubble.tsx b/ts/components/conversation/TypingBubble.tsx
index f622f0233c..0e2ed1fdfc 100644
--- a/ts/components/conversation/TypingBubble.tsx
+++ b/ts/components/conversation/TypingBubble.tsx
@@ -1,16 +1,15 @@
 import React from 'react';
 import styled from 'styled-components';
 
-import { TypingAnimation } from './TypingAnimation';
 import { ConversationTypeEnum } from '../../models/conversationAttributes';
-import { useSelectedIsGroup } from '../../state/selectors/selectedConversation';
+import { TypingAnimation } from './TypingAnimation';
 
 interface TypingBubbleProps {
   conversationType: ConversationTypeEnum;
   isTyping: boolean;
 }
 
-const TypingBubbleContainer = styled.div<TypingBubbleProps>`
+const TypingBubbleContainer = styled.div<Pick<TypingBubbleProps, 'isTyping'>>`
   height: ${props => (props.isTyping ? 'auto' : '0px')};
   display: flow-root;
   padding-bottom: ${props => (props.isTyping ? '4px' : '0px')};
@@ -23,13 +22,13 @@ const TypingBubbleContainer = styled.div<TypingBubbleProps>`
 `;
 
 export const TypingBubble = (props: TypingBubbleProps) => {
-  const isOpenOrClosedGroup = useSelectedIsGroup();
-  if (!isOpenOrClosedGroup || !props.isTyping) {
+  const isPrivate = props.conversationType === ConversationTypeEnum.PRIVATE;
+  if (!isPrivate || !props.isTyping) {
     return null;
   }
 
   return (
-    <TypingBubbleContainer {...props}>
+    <TypingBubbleContainer isTyping={props.isTyping}>
       <TypingAnimation />
     </TypingBubbleContainer>
   );