From 90348c7da4984ee15fb643f78f7f444b35695739 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Tue, 1 Sep 2026 19:28:07 +0300
Subject: [PATCH 01/18] drive-by

---
 src/stores/users.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/stores/users.js b/src/stores/users.js
index 7c87d4f7f..b9725a652 100644
--- a/src/stores/users.js
+++ b/src/stores/users.js
@@ -707,7 +707,7 @@ export const useUsersStore = defineStore('users', {
           useOAuthStore().clearToken()
         }
 
-        if (error.tatusCode === 401) {
+        if (error.statusCode === 401) {
           throw new Error('Wrong username or password', error)
         } else {
           throw new Error('An error occurred, please try again', error)

From 71a9851881734802fea26796f86275ba5e8e76b3 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Wed, 2 Sep 2026 22:34:28 +0300
Subject: [PATCH 02/18] fix

---
 src/components/navigation/navigation_entry.vue | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/components/navigation/navigation_entry.vue b/src/components/navigation/navigation_entry.vue
index b3e14d073..cbebbaf47 100644
--- a/src/components/navigation/navigation_entry.vue
+++ b/src/components/navigation/navigation_entry.vue
@@ -53,12 +53,6 @@
       >
         {{ badges[item.badgeGetter] }}
       </div>
-      <div
-        v-else-if="item.badgeGetter && item.store && badges[item.badgeGetter]"
-        class="badge badge-notification"
-      >
-        {{ this[`${item.store}Store`][item.badgeGetter] }}
-      </div>
       <button
         v-if="showPin && currentUser"
         type="button"

From 88271d3bbc44fbe3e16551e3762b399e77b409e4 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Wed, 2 Sep 2026 22:36:16 +0300
Subject: [PATCH 03/18] changelog i guess

---
 changelog.d/drafts.fix | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/drafts.fix

diff --git a/changelog.d/drafts.fix b/changelog.d/drafts.fix
new file mode 100644
index 000000000..f209455c5
--- /dev/null
+++ b/changelog.d/drafts.fix
@@ -0,0 +1 @@
+Fixed drafts creating duplicates on edit instead of updating

From 2731ea81cbfd5f2c2872e7c3d32892089ac48cc0 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Wed, 2 Sep 2026 22:41:53 +0300
Subject: [PATCH 04/18] leftover

---
 src/modules/index.js | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 src/modules/index.js

diff --git a/src/modules/index.js b/src/modules/index.js
deleted file mode 100644
index b1c6ea436..000000000
--- a/src/modules/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export default {}

From 3cc8402e012c29cd4e527646be1c9ec3f784d1f8 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Thu, 3 Sep 2026 13:20:24 +0300
Subject: [PATCH 05/18] actually import lodash-es

---
 src/App.js                                                      | 2 +-
 src/api/helpers.js                                              | 2 +-
 src/api/user.js                                                 | 2 +-
 src/components/chat_message_list/chat_message_list.js           | 2 +-
 src/components/chat_view/chat_view.js                           | 2 +-
 src/components/color_input/color_input.vue                      | 2 +-
 src/components/conversation/conversation.js                     | 2 +-
 src/components/edit_status_modal/edit_status_modal.js           | 2 +-
 src/components/emoji_input/emoji_input.js                       | 2 +-
 src/components/emoji_picker/emoji_picker.js                     | 2 +-
 src/components/gallery/gallery.js                               | 2 +-
 src/components/list/list.js                                     | 2 +-
 src/components/lists_user_search/lists_user_search.js           | 2 +-
 .../mobile_post_status_button/mobile_post_status_button.js      | 2 +-
 src/components/moderation_tools/moderation_tools.js             | 2 +-
 src/components/mrf_transparency_panel/mrf_transparency_panel.js | 2 +-
 src/components/post_status_form/post_status_form.js             | 2 +-
 src/components/quote/quote_form.js                              | 2 +-
 src/components/rich_content/rich_content.jsx                    | 2 +-
 src/components/search/search.js                                 | 2 +-
 src/components/settings_modal/admin_tabs/emoji_tab.js           | 2 +-
 src/components/settings_modal/admin_tabs/http_tab.js            | 2 +-
 src/components/settings_modal/admin_tabs/instance_tab.js        | 2 +-
 src/components/settings_modal/admin_tabs/links_tab.js           | 2 +-
 .../settings_modal/helpers/pwa_manifest_icons_setting.js        | 2 +-
 src/components/settings_modal/helpers/setting.js                | 2 +-
 src/components/settings_modal/settings_modal.js                 | 2 +-
 src/components/settings_modal/tabs/filtering_tab.js             | 2 +-
 src/components/settings_modal/tabs/mutes_and_blocks_tab.js      | 2 +-
 src/components/settings_modal/tabs/style_tab/style_tab.js       | 2 +-
 src/components/shadow_control/shadow_control.js                 | 2 +-
 src/components/staff_panel/staff_panel.js                       | 2 +-
 src/components/timeline/timeline.js                             | 2 +-
 src/components/user_card/user_card.js                           | 2 +-
 src/components/user_profile/user_profile.js                     | 2 +-
 src/components/who_to_follow_panel/who_to_follow_panel.js       | 2 +-
 src/i18n/messages.js                                            | 2 +-
 src/lib/persisted_state.js                                      | 2 +-
 src/modules/default_config_state.js                             | 2 +-
 src/services/attributes_helper/attributes_helper.service.js     | 2 +-
 src/services/completion/completion.js                           | 2 +-
 src/services/component_utils/component_utils.js                 | 2 +-
 src/services/entity_normalizer/entity_normalizer.service.js     | 2 +-
 src/services/errors/errors.js                                   | 2 +-
 src/services/html_converter/html_tree_converter.service.js      | 2 +-
 src/services/locale/locale.service.js                           | 2 +-
 src/services/style_setter/style_setter.js                       | 2 +-
 src/services/theme_data/iss_deserializer.js                     | 2 +-
 src/services/theme_data/iss_utils.js                            | 2 +-
 src/services/theme_data/theme_data_3.service.js                 | 2 +-
 .../user_profile_link_generator/user_profile_link_generator.js  | 2 +-
 src/stores/admin_settings.js                                    | 2 +-
 src/stores/bookmark_folders.js                                  | 2 +-
 src/stores/chats.js                                             | 2 +-
 src/stores/emoji.js                                             | 2 +-
 src/stores/instance.js                                          | 2 +-
 src/stores/lists.js                                             | 2 +-
 src/stores/local_config.js                                      | 2 +-
 src/stores/polls.js                                             | 2 +-
 src/stores/profile_config.js                                    | 2 +-
 src/stores/sync_config.js                                       | 2 +-
 src/stores/timelines.js                                         | 2 +-
 src/stores/user_highlight.js                                    | 2 +-
 src/stores/users.js                                             | 2 +-
 test/unit/specs/stores/statuses.spec.js                         | 2 +-
 test/unit/specs/stores/sync_config.spec.js                      | 2 +-
 test/unit/specs/stores/users.spec.js                            | 2 +-
 67 files changed, 67 insertions(+), 67 deletions(-)

diff --git a/src/App.js b/src/App.js
index ed3d43e4a..66ae09a9d 100644
--- a/src/App.js
+++ b/src/App.js
@@ -1,4 +1,4 @@
-import { throttle } from 'lodash'
+import { throttle } from 'lodash-es'
 import { mapState } from 'pinia'
 import { defineAsyncComponent } from 'vue'
 
diff --git a/src/api/helpers.js b/src/api/helpers.js
index f23960ed9..6afd20468 100644
--- a/src/api/helpers.js
+++ b/src/api/helpers.js
@@ -1,4 +1,4 @@
-import { snakeCase } from 'lodash'
+import { snakeCase } from 'lodash-es'
 
 import { StatusCodeError } from 'src/services/errors/errors'
 
diff --git a/src/api/user.js b/src/api/user.js
index d3a2a4a70..8849847d6 100644
--- a/src/api/user.js
+++ b/src/api/user.js
@@ -1,4 +1,4 @@
-import { last } from 'lodash'
+import { last } from 'lodash-es'
 
 import { paramsString, promisedRequest } from './helpers.js'
 import { fetchFriends, MASTODON_STATUS_URL } from './public.js'
diff --git a/src/components/chat_message_list/chat_message_list.js b/src/components/chat_message_list/chat_message_list.js
index a51e6a0e4..6aef4336b 100644
--- a/src/components/chat_message_list/chat_message_list.js
+++ b/src/components/chat_message_list/chat_message_list.js
@@ -1,4 +1,4 @@
-import { orderBy, uniqueId } from 'lodash'
+import { orderBy, uniqueId } from 'lodash-es'
 
 import ChatMessage from 'src/components/chat_message/chat_message.vue'
 
diff --git a/src/components/chat_view/chat_view.js b/src/components/chat_view/chat_view.js
index a0abcb5fe..7d80459bb 100644
--- a/src/components/chat_view/chat_view.js
+++ b/src/components/chat_view/chat_view.js
@@ -1,4 +1,4 @@
-import { get, maxBy, minBy, sortBy, throttle } from 'lodash'
+import { get, maxBy, minBy, sortBy, throttle } from 'lodash-es'
 import { mapState } from 'pinia'
 import { nextTick } from 'vue'
 
diff --git a/src/components/color_input/color_input.vue b/src/components/color_input/color_input.vue
index 53396f532..821a1be0e 100644
--- a/src/components/color_input/color_input.vue
+++ b/src/components/color_input/color_input.vue
@@ -64,7 +64,7 @@
   </div>
 </template>
 <script>
-import { throttle } from 'lodash'
+import { throttle } from 'lodash-es'
 
 import Checkbox from 'src/components/checkbox/checkbox.vue'
 import { hex2rgb } from '../../services/color_convert/color_convert.js'
diff --git a/src/components/conversation/conversation.js b/src/components/conversation/conversation.js
index 4eb29bcd6..7f0686491 100644
--- a/src/components/conversation/conversation.js
+++ b/src/components/conversation/conversation.js
@@ -1,4 +1,4 @@
-import { get, reduce } from 'lodash'
+import { get, reduce } from 'lodash-es'
 import { mapState } from 'pinia'
 
 import ChatMessageList from 'src/components/chat_message_list/chat_message_list.vue'
diff --git a/src/components/edit_status_modal/edit_status_modal.js b/src/components/edit_status_modal/edit_status_modal.js
index 8ebbe9a2d..d36147ff6 100644
--- a/src/components/edit_status_modal/edit_status_modal.js
+++ b/src/components/edit_status_modal/edit_status_modal.js
@@ -1,4 +1,4 @@
-import { get } from 'lodash'
+import { get } from 'lodash-es'
 import { mapState } from 'pinia'
 import { defineAsyncComponent } from 'vue'
 
diff --git a/src/components/emoji_input/emoji_input.js b/src/components/emoji_input/emoji_input.js
index d8cc7a919..e49f07b7b 100644
--- a/src/components/emoji_input/emoji_input.js
+++ b/src/components/emoji_input/emoji_input.js
@@ -1,4 +1,4 @@
-import { take } from 'lodash'
+import { take } from 'lodash-es'
 
 import Popover from 'src/components/popover/popover.vue'
 import ScreenReaderNotice from 'src/components/screen_reader_notice/screen_reader_notice.vue'
diff --git a/src/components/emoji_picker/emoji_picker.js b/src/components/emoji_picker/emoji_picker.js
index a0e30bf6d..46d7304d1 100644
--- a/src/components/emoji_picker/emoji_picker.js
+++ b/src/components/emoji_picker/emoji_picker.js
@@ -1,4 +1,4 @@
-import { chunk, debounce, trim } from 'lodash'
+import { chunk, debounce, trim } from 'lodash-es'
 import { defineAsyncComponent } from 'vue'
 
 import Checkbox from 'src/components/checkbox/checkbox.vue'
diff --git a/src/components/gallery/gallery.js b/src/components/gallery/gallery.js
index c244a8cb3..f6c79ac76 100644
--- a/src/components/gallery/gallery.js
+++ b/src/components/gallery/gallery.js
@@ -1,4 +1,4 @@
-import { set, sumBy } from 'lodash'
+import { set, sumBy } from 'lodash-es'
 
 import Attachment from 'src/components/attachment/attachment.vue'
 
diff --git a/src/components/list/list.js b/src/components/list/list.js
index 8abf02fd6..2283f5260 100644
--- a/src/components/list/list.js
+++ b/src/components/list/list.js
@@ -1,4 +1,4 @@
-import { isEmpty } from 'lodash'
+import { isEmpty } from 'lodash-es'
 
 import Checkbox from 'src/components/checkbox/checkbox.vue'
 
diff --git a/src/components/lists_user_search/lists_user_search.js b/src/components/lists_user_search/lists_user_search.js
index 22568135a..4dde2f589 100644
--- a/src/components/lists_user_search/lists_user_search.js
+++ b/src/components/lists_user_search/lists_user_search.js
@@ -1,4 +1,4 @@
-import { debounce } from 'lodash'
+import { debounce } from 'lodash-es'
 
 import Checkbox from 'src/components/checkbox/checkbox.vue'
 
diff --git a/src/components/mobile_post_status_button/mobile_post_status_button.js b/src/components/mobile_post_status_button/mobile_post_status_button.js
index 0ffab6f78..3fbd9b77b 100644
--- a/src/components/mobile_post_status_button/mobile_post_status_button.js
+++ b/src/components/mobile_post_status_button/mobile_post_status_button.js
@@ -1,4 +1,4 @@
-import { debounce } from 'lodash'
+import { debounce } from 'lodash-es'
 import { mapState } from 'pinia'
 
 import { useMergedConfigStore } from 'src/stores/merged_config.js'
diff --git a/src/components/moderation_tools/moderation_tools.js b/src/components/moderation_tools/moderation_tools.js
index 9b948e306..73bf6e515 100644
--- a/src/components/moderation_tools/moderation_tools.js
+++ b/src/components/moderation_tools/moderation_tools.js
@@ -1,4 +1,4 @@
-import { last } from 'lodash'
+import { last } from 'lodash-es'
 
 import ConfirmModal from 'src/components/confirm_modal/confirm_modal.vue'
 import Popover from 'src/components/popover/popover.vue'
diff --git a/src/components/mrf_transparency_panel/mrf_transparency_panel.js b/src/components/mrf_transparency_panel/mrf_transparency_panel.js
index 7f2a16186..c3530975e 100644
--- a/src/components/mrf_transparency_panel/mrf_transparency_panel.js
+++ b/src/components/mrf_transparency_panel/mrf_transparency_panel.js
@@ -1,4 +1,4 @@
-import { get } from 'lodash'
+import { get } from 'lodash-es'
 import { mapState } from 'pinia'
 
 import { useInstanceStore } from 'src/stores/instance.js'
diff --git a/src/components/post_status_form/post_status_form.js b/src/components/post_status_form/post_status_form.js
index ed48de2d7..129da21eb 100644
--- a/src/components/post_status_form/post_status_form.js
+++ b/src/components/post_status_form/post_status_form.js
@@ -4,7 +4,7 @@ import {
   unescape as ldUnescape,
   reject,
   uniqBy,
-} from 'lodash'
+} from 'lodash-es'
 import { mapActions, mapState } from 'pinia'
 import { defineAsyncComponent } from 'vue'
 
diff --git a/src/components/quote/quote_form.js b/src/components/quote/quote_form.js
index 700119be8..1b41af38c 100644
--- a/src/components/quote/quote_form.js
+++ b/src/components/quote/quote_form.js
@@ -1,4 +1,4 @@
-import { debounce } from 'lodash'
+import { debounce } from 'lodash-es'
 
 import Checkbox from 'src/components/checkbox/checkbox.vue'
 import Quote from './quote.vue'
diff --git a/src/components/rich_content/rich_content.jsx b/src/components/rich_content/rich_content.jsx
index f80f153b1..70863a8a4 100644
--- a/src/components/rich_content/rich_content.jsx
+++ b/src/components/rich_content/rich_content.jsx
@@ -1,4 +1,4 @@
-import { flattenDeep, unescape as ldUnescape } from 'lodash'
+import { flattenDeep, unescape as ldUnescape } from 'lodash-es'
 
 import HashtagLink from 'src/components/hashtag_link/hashtag_link.vue'
 import { MENTIONS_LIMIT } from 'src/components/mentions_line/mentions_line.js'
diff --git a/src/components/search/search.js b/src/components/search/search.js
index 43a9b4f73..81478e798 100644
--- a/src/components/search/search.js
+++ b/src/components/search/search.js
@@ -1,4 +1,4 @@
-import { map, uniqBy } from 'lodash'
+import { map, uniqBy } from 'lodash-es'
 
 import Conversation from 'src/components/conversation/conversation.vue'
 import FollowCard from 'src/components/follow_card/follow_card.vue'
diff --git a/src/components/settings_modal/admin_tabs/emoji_tab.js b/src/components/settings_modal/admin_tabs/emoji_tab.js
index 33ead7c16..2290d9171 100644
--- a/src/components/settings_modal/admin_tabs/emoji_tab.js
+++ b/src/components/settings_modal/admin_tabs/emoji_tab.js
@@ -2,7 +2,7 @@ import Checkbox from 'components/checkbox/checkbox.vue'
 import Popover from 'components/popover/popover.vue'
 import Select from 'components/select/select.vue'
 import StillImage from 'components/still-image/still-image.vue'
-import { clone } from 'lodash'
+import { clone } from 'lodash-es'
 import { defineAsyncComponent } from 'vue'
 
 import TabSwitcher from 'src/components/tab_switcher/tab_switcher.jsx'
diff --git a/src/components/settings_modal/admin_tabs/http_tab.js b/src/components/settings_modal/admin_tabs/http_tab.js
index 1e45763f9..5c9602766 100644
--- a/src/components/settings_modal/admin_tabs/http_tab.js
+++ b/src/components/settings_modal/admin_tabs/http_tab.js
@@ -1,4 +1,4 @@
-import { get } from 'lodash'
+import { get } from 'lodash-es'
 
 import AttachmentSetting from '../helpers/attachment_setting.vue'
 import BooleanSetting from '../helpers/boolean_setting.vue'
diff --git a/src/components/settings_modal/admin_tabs/instance_tab.js b/src/components/settings_modal/admin_tabs/instance_tab.js
index a428a78f9..586f1556e 100644
--- a/src/components/settings_modal/admin_tabs/instance_tab.js
+++ b/src/components/settings_modal/admin_tabs/instance_tab.js
@@ -1,4 +1,4 @@
-import { get } from 'lodash'
+import { get } from 'lodash-es'
 
 import AttachmentSetting from '../helpers/attachment_setting.vue'
 import BooleanSetting from '../helpers/boolean_setting.vue'
diff --git a/src/components/settings_modal/admin_tabs/links_tab.js b/src/components/settings_modal/admin_tabs/links_tab.js
index a6b99483b..d6a9b3a12 100644
--- a/src/components/settings_modal/admin_tabs/links_tab.js
+++ b/src/components/settings_modal/admin_tabs/links_tab.js
@@ -1,4 +1,4 @@
-import { get } from 'lodash'
+import { get } from 'lodash-es'
 
 import Checkbox from 'src/components/checkbox/checkbox.vue'
 import AttachmentSetting from '../helpers/attachment_setting.vue'
diff --git a/src/components/settings_modal/helpers/pwa_manifest_icons_setting.js b/src/components/settings_modal/helpers/pwa_manifest_icons_setting.js
index 0af54d3df..892a61c25 100644
--- a/src/components/settings_modal/helpers/pwa_manifest_icons_setting.js
+++ b/src/components/settings_modal/helpers/pwa_manifest_icons_setting.js
@@ -1,4 +1,4 @@
-import { clone } from 'lodash'
+import { clone } from 'lodash-es'
 
 import Attachment from 'src/components/attachment/attachment.vue'
 import MediaUpload from 'src/components/media_upload/media_upload.vue'
diff --git a/src/components/settings_modal/helpers/setting.js b/src/components/settings_modal/helpers/setting.js
index 31afc9068..0c321df63 100644
--- a/src/components/settings_modal/helpers/setting.js
+++ b/src/components/settings_modal/helpers/setting.js
@@ -1,4 +1,4 @@
-import { cloneDeep, get, isEqual, set } from 'lodash'
+import { cloneDeep, get, isEqual, set } from 'lodash-es'
 
 import DraftButtons from './draft_buttons.vue'
 import LocalSettingIndicator from './local_setting_indicator.vue'
diff --git a/src/components/settings_modal/settings_modal.js b/src/components/settings_modal/settings_modal.js
index 216ce1b7c..0595e3091 100644
--- a/src/components/settings_modal/settings_modal.js
+++ b/src/components/settings_modal/settings_modal.js
@@ -1,4 +1,4 @@
-import { cloneDeep, isEqual } from 'lodash'
+import { cloneDeep, isEqual } from 'lodash-es'
 import { mapActions, mapState } from 'pinia'
 import { defineAsyncComponent } from 'vue'
 
diff --git a/src/components/settings_modal/tabs/filtering_tab.js b/src/components/settings_modal/tabs/filtering_tab.js
index 601483106..09d14de0d 100644
--- a/src/components/settings_modal/tabs/filtering_tab.js
+++ b/src/components/settings_modal/tabs/filtering_tab.js
@@ -1,4 +1,4 @@
-import { cloneDeep } from 'lodash'
+import { cloneDeep } from 'lodash-es'
 import { mapActions, mapState } from 'pinia'
 import { v4 as uuidv4 } from 'uuid'
 
diff --git a/src/components/settings_modal/tabs/mutes_and_blocks_tab.js b/src/components/settings_modal/tabs/mutes_and_blocks_tab.js
index 719d3a7e3..98c3a1a5b 100644
--- a/src/components/settings_modal/tabs/mutes_and_blocks_tab.js
+++ b/src/components/settings_modal/tabs/mutes_and_blocks_tab.js
@@ -1,4 +1,4 @@
-import { get, map, reject } from 'lodash'
+import { get, map, reject } from 'lodash-es'
 
 import Autosuggest from 'src/components/autosuggest/autosuggest.vue'
 import BlockCard from 'src/components/block_card/block_card.vue'
diff --git a/src/components/settings_modal/tabs/style_tab/style_tab.js b/src/components/settings_modal/tabs/style_tab/style_tab.js
index a023b4415..e867e1d79 100644
--- a/src/components/settings_modal/tabs/style_tab/style_tab.js
+++ b/src/components/settings_modal/tabs/style_tab/style_tab.js
@@ -1,4 +1,4 @@
-import { get, set, throttle, unset } from 'lodash'
+import { get, set, throttle, unset } from 'lodash-es'
 import {
   computed,
   getCurrentInstance,
diff --git a/src/components/shadow_control/shadow_control.js b/src/components/shadow_control/shadow_control.js
index 52ca888fe..9a1b146d4 100644
--- a/src/components/shadow_control/shadow_control.js
+++ b/src/components/shadow_control/shadow_control.js
@@ -1,4 +1,4 @@
-import { flattenDeep, throttle } from 'lodash'
+import { flattenDeep, throttle } from 'lodash-es'
 
 import Checkbox from 'src/components/checkbox/checkbox.vue'
 import ColorInput from 'src/components/color_input/color_input.vue'
diff --git a/src/components/staff_panel/staff_panel.js b/src/components/staff_panel/staff_panel.js
index 7ceda1e41..c00d6e679 100644
--- a/src/components/staff_panel/staff_panel.js
+++ b/src/components/staff_panel/staff_panel.js
@@ -1,4 +1,4 @@
-import { groupBy, map } from 'lodash'
+import { groupBy, map } from 'lodash-es'
 import { mapState } from 'pinia'
 
 import BasicUserCard from 'src/components/basic_user_card/basic_user_card.vue'
diff --git a/src/components/timeline/timeline.js b/src/components/timeline/timeline.js
index 38ee99931..7600e1765 100644
--- a/src/components/timeline/timeline.js
+++ b/src/components/timeline/timeline.js
@@ -1,4 +1,4 @@
-import { debounce, throttle } from 'lodash'
+import { debounce, throttle } from 'lodash-es'
 import { mapState } from 'pinia'
 
 import Conversation from 'src/components/conversation/conversation.vue'
diff --git a/src/components/user_card/user_card.js b/src/components/user_card/user_card.js
index 40fdd7413..fdbda2783 100644
--- a/src/components/user_card/user_card.js
+++ b/src/components/user_card/user_card.js
@@ -3,7 +3,7 @@ import {
   escape as ldEscape,
   unescape as ldUnescape,
   merge,
-} from 'lodash'
+} from 'lodash-es'
 import { mapState } from 'pinia'
 import { defineAsyncComponent } from 'vue'
 
diff --git a/src/components/user_profile/user_profile.js b/src/components/user_profile/user_profile.js
index 521de0775..14bc77480 100644
--- a/src/components/user_profile/user_profile.js
+++ b/src/components/user_profile/user_profile.js
@@ -1,4 +1,4 @@
-import { get } from 'lodash'
+import { get } from 'lodash-es'
 
 import FollowCard from 'src/components/follow_card/follow_card.vue'
 import List from 'src/components/list/list.vue'
diff --git a/src/components/who_to_follow_panel/who_to_follow_panel.js b/src/components/who_to_follow_panel/who_to_follow_panel.js
index 107ec42f7..9daabec30 100644
--- a/src/components/who_to_follow_panel/who_to_follow_panel.js
+++ b/src/components/who_to_follow_panel/who_to_follow_panel.js
@@ -1,4 +1,4 @@
-import { shuffle } from 'lodash'
+import { shuffle } from 'lodash-es'
 
 import { useInstanceStore } from 'src/stores/instance.js'
 import { useOAuthStore } from 'src/stores/oauth.js'
diff --git a/src/i18n/messages.js b/src/i18n/messages.js
index 51b8d920c..db18736ad 100644
--- a/src/i18n/messages.js
+++ b/src/i18n/messages.js
@@ -7,7 +7,7 @@
 // sed -i -e "s/'//gm" -e 's/"/\\"/gm' -re 's/^( +)(.+?): ((.+?))?(,?)(\{?)$/\1"\2": "\4"/gm' -e 's/\"\{\"/{/g' -e 's/,"$/",/g' file.json
 // There's only problem that apostrophe character ' gets replaced by \\ so you have to fix it manually, sorry.
 
-import { isEqual } from 'lodash'
+import { isEqual } from 'lodash-es'
 
 import enMessages from './en.json'
 import { langCodeToJsonName, languages } from './languages.js'
diff --git a/src/lib/persisted_state.js b/src/lib/persisted_state.js
index 5a698ac8e..b1132f377 100644
--- a/src/lib/persisted_state.js
+++ b/src/lib/persisted_state.js
@@ -1,4 +1,4 @@
-import { cloneDeep, get, set } from 'lodash'
+import { cloneDeep, get, set } from 'lodash-es'
 
 import { storage } from './storage.js'
 
diff --git a/src/modules/default_config_state.js b/src/modules/default_config_state.js
index 9935e88ce..9643b1856 100644
--- a/src/modules/default_config_state.js
+++ b/src/modules/default_config_state.js
@@ -1,4 +1,4 @@
-import { get } from 'lodash'
+import { get } from 'lodash-es'
 
 const browserLocale = (navigator.language || 'en').split('-')[0]
 
diff --git a/src/services/attributes_helper/attributes_helper.service.js b/src/services/attributes_helper/attributes_helper.service.js
index 5b607600e..1772944d7 100644
--- a/src/services/attributes_helper/attributes_helper.service.js
+++ b/src/services/attributes_helper/attributes_helper.service.js
@@ -1,4 +1,4 @@
-import { kebabCase } from 'lodash'
+import { kebabCase } from 'lodash-es'
 
 const propsToNative = (props) =>
   Object.keys(props).reduce((acc, cur) => {
diff --git a/src/services/completion/completion.js b/src/services/completion/completion.js
index 7bd72536d..77b258352 100644
--- a/src/services/completion/completion.js
+++ b/src/services/completion/completion.js
@@ -1,4 +1,4 @@
-import { find, reduce } from 'lodash'
+import { find, reduce } from 'lodash-es'
 
 export const replaceWord = (str, toReplace, replacement) => {
   return str.slice(0, toReplace.start) + replacement + str.slice(toReplace.end)
diff --git a/src/services/component_utils/component_utils.js b/src/services/component_utils/component_utils.js
index 1973a7923..c130c1af3 100644
--- a/src/services/component_utils/component_utils.js
+++ b/src/services/component_utils/component_utils.js
@@ -1,4 +1,4 @@
-import { isFunction } from 'lodash'
+import { isFunction } from 'lodash-es'
 
 const getComponentOptions = (Component) =>
   isFunction(Component) ? Component.options : Component
diff --git a/src/services/entity_normalizer/entity_normalizer.service.js b/src/services/entity_normalizer/entity_normalizer.service.js
index 88e2fd0a5..6868a9805 100644
--- a/src/services/entity_normalizer/entity_normalizer.service.js
+++ b/src/services/entity_normalizer/entity_normalizer.service.js
@@ -1,6 +1,6 @@
 import { parseLinkHeader } from '@web3-storage/parse-link-header'
 import escapeHtml from 'escape-html'
-import { unescape as lodashUnescape } from 'lodash'
+import { unescape as lodashUnescape } from 'lodash-es'
 import punycode from 'punycode.js'
 
 import { fileType } from '../file_type/file_type.service.js'
diff --git a/src/services/errors/errors.js b/src/services/errors/errors.js
index 0742de3f4..439432faf 100644
--- a/src/services/errors/errors.js
+++ b/src/services/errors/errors.js
@@ -1,4 +1,4 @@
-import { capitalize } from 'lodash'
+import { capitalize } from 'lodash-es'
 
 function humanizeErrors(errors) {
   return Object.entries(errors).reduce((errs, [k, val]) => {
diff --git a/src/services/html_converter/html_tree_converter.service.js b/src/services/html_converter/html_tree_converter.service.js
index 4e2df2762..c3e3cc5b7 100644
--- a/src/services/html_converter/html_tree_converter.service.js
+++ b/src/services/html_converter/html_tree_converter.service.js
@@ -1,4 +1,4 @@
-import { unescape as ldUnescape } from 'lodash'
+import { unescape as ldUnescape } from 'lodash-es'
 
 import { getTagName } from './utility.service.js'
 
diff --git a/src/services/locale/locale.service.js b/src/services/locale/locale.service.js
index bdc07c1ec..47c910791 100644
--- a/src/services/locale/locale.service.js
+++ b/src/services/locale/locale.service.js
@@ -1,5 +1,5 @@
 import ISO6391 from 'iso-639-1'
-import { map } from 'lodash'
+import { map } from 'lodash-es'
 
 import languagesObject from '../../i18n/messages'
 
diff --git a/src/services/style_setter/style_setter.js b/src/services/style_setter/style_setter.js
index 5acd124b4..ac286928a 100644
--- a/src/services/style_setter/style_setter.js
+++ b/src/services/style_setter/style_setter.js
@@ -1,6 +1,6 @@
 import sum from 'hash-sum'
 import localforage from 'localforage'
-import { chunk, throttle } from 'lodash'
+import { chunk, throttle } from 'lodash-es'
 
 import { getCssRules } from '../theme_data/css_utils.js'
 import { getEngineChecksum, init } from '../theme_data/theme_data_3.service.js'
diff --git a/src/services/theme_data/iss_deserializer.js b/src/services/theme_data/iss_deserializer.js
index e5506ae42..71e4b4a18 100644
--- a/src/services/theme_data/iss_deserializer.js
+++ b/src/services/theme_data/iss_deserializer.js
@@ -1,4 +1,4 @@
-import { flattenDeep } from 'lodash'
+import { flattenDeep } from 'lodash-es'
 
 export const deserializeShadow = (string) => {
   const modes = [
diff --git a/src/services/theme_data/iss_utils.js b/src/services/theme_data/iss_utils.js
index d42da3780..b1c8403e8 100644
--- a/src/services/theme_data/iss_utils.js
+++ b/src/services/theme_data/iss_utils.js
@@ -1,4 +1,4 @@
-import { sortBy } from 'lodash'
+import { sortBy } from 'lodash-es'
 
 // "Unrolls" a tree structure of item: { parent: { ...item2, parent: { ...item3, parent: {...} } }}
 // into an array [item2, item3] for iterating
diff --git a/src/services/theme_data/theme_data_3.service.js b/src/services/theme_data/theme_data_3.service.js
index 694e41e12..9d71c461e 100644
--- a/src/services/theme_data/theme_data_3.service.js
+++ b/src/services/theme_data/theme_data_3.service.js
@@ -1,6 +1,6 @@
 import { brightness, convert } from 'chromatism'
 import sum from 'hash-sum'
-import { flattenDeep, sortBy } from 'lodash'
+import { flattenDeep, sortBy } from 'lodash-es'
 
 import {
   alphaBlend,
diff --git a/src/services/user_profile_link_generator/user_profile_link_generator.js b/src/services/user_profile_link_generator/user_profile_link_generator.js
index 45cd0ea99..ab1e3c31d 100644
--- a/src/services/user_profile_link_generator/user_profile_link_generator.js
+++ b/src/services/user_profile_link_generator/user_profile_link_generator.js
@@ -1,4 +1,4 @@
-import { includes } from 'lodash'
+import { includes } from 'lodash-es'
 
 const generateProfileLink = (id, screenName, restrictedNicknames) => {
   const complicated =
diff --git a/src/stores/admin_settings.js b/src/stores/admin_settings.js
index 4961761e7..10efdbfce 100644
--- a/src/stores/admin_settings.js
+++ b/src/stores/admin_settings.js
@@ -1,4 +1,4 @@
-import { cloneDeep, differenceWith, get, isEqual, set } from 'lodash'
+import { cloneDeep, differenceWith, get, isEqual, set } from 'lodash-es'
 import { defineStore } from 'pinia'
 
 import { useOAuthStore } from 'src/stores/oauth.js'
diff --git a/src/stores/bookmark_folders.js b/src/stores/bookmark_folders.js
index 713a21d00..6d032e2bb 100644
--- a/src/stores/bookmark_folders.js
+++ b/src/stores/bookmark_folders.js
@@ -1,4 +1,4 @@
-import { find, remove } from 'lodash'
+import { find, remove } from 'lodash-es'
 import { defineStore } from 'pinia'
 
 import { useOAuthStore } from 'src/stores/oauth.js'
diff --git a/src/stores/chats.js b/src/stores/chats.js
index 32296ff4f..71267faff 100644
--- a/src/stores/chats.js
+++ b/src/stores/chats.js
@@ -1,4 +1,4 @@
-import { orderBy, sumBy } from 'lodash'
+import { orderBy, sumBy } from 'lodash-es'
 import { defineStore } from 'pinia'
 
 import { maybeShowChatNotification } from '../services/chat_utils/chat_utils.js'
diff --git a/src/stores/emoji.js b/src/stores/emoji.js
index 1471f3dfb..b893198d7 100644
--- a/src/stores/emoji.js
+++ b/src/stores/emoji.js
@@ -1,4 +1,4 @@
-import { merge } from 'lodash'
+import { merge } from 'lodash-es'
 import { defineStore } from 'pinia'
 
 import { useInstanceStore } from 'src/stores/instance.js'
diff --git a/src/stores/instance.js b/src/stores/instance.js
index 0d1da35d0..231140ca5 100644
--- a/src/stores/instance.js
+++ b/src/stores/instance.js
@@ -1,4 +1,4 @@
-import { set } from 'lodash'
+import { set } from 'lodash-es'
 import { defineStore } from 'pinia'
 
 import {
diff --git a/src/stores/lists.js b/src/stores/lists.js
index fcc3fefde..b3ce52d30 100644
--- a/src/stores/lists.js
+++ b/src/stores/lists.js
@@ -1,4 +1,4 @@
-import { find, remove } from 'lodash'
+import { find, remove } from 'lodash-es'
 import { defineStore } from 'pinia'
 
 import { useOAuthStore } from 'src/stores/oauth.js'
diff --git a/src/stores/local_config.js b/src/stores/local_config.js
index 786da657b..82fb6f265 100644
--- a/src/stores/local_config.js
+++ b/src/stores/local_config.js
@@ -1,4 +1,4 @@
-import { cloneDeep, set } from 'lodash'
+import { cloneDeep, set } from 'lodash-es'
 import { defineStore } from 'pinia'
 
 import {
diff --git a/src/stores/polls.js b/src/stores/polls.js
index e2f4b0ab2..805fb0026 100644
--- a/src/stores/polls.js
+++ b/src/stores/polls.js
@@ -1,4 +1,4 @@
-import { merge } from 'lodash'
+import { merge } from 'lodash-es'
 import { defineStore } from 'pinia'
 
 import { useOAuthStore } from 'src/stores/oauth.js'
diff --git a/src/stores/profile_config.js b/src/stores/profile_config.js
index 516b3845e..a918e5ee2 100644
--- a/src/stores/profile_config.js
+++ b/src/stores/profile_config.js
@@ -1,4 +1,4 @@
-import { get, set } from 'lodash'
+import { get, set } from 'lodash-es'
 import { defineStore } from 'pinia'
 
 import { useOAuthStore } from 'src/stores/oauth.js'
diff --git a/src/stores/sync_config.js b/src/stores/sync_config.js
index 4de0c13cb..26c447530 100644
--- a/src/stores/sync_config.js
+++ b/src/stores/sync_config.js
@@ -12,7 +12,7 @@ import {
   take,
   uniqWith,
   unset,
-} from 'lodash'
+} from 'lodash-es'
 import { defineStore } from 'pinia'
 import { v4 as uuidv4 } from 'uuid'
 import { toRaw } from 'vue'
diff --git a/src/stores/timelines.js b/src/stores/timelines.js
index 86a2c617e..8de616c8a 100644
--- a/src/stores/timelines.js
+++ b/src/stores/timelines.js
@@ -1,4 +1,4 @@
-import { first, last } from 'lodash'
+import { first, last } from 'lodash-es'
 import { defineStore } from 'pinia'
 
 import timelineFetcher from 'src/stores/fetchers/timeline_fetcher.js'
diff --git a/src/stores/user_highlight.js b/src/stores/user_highlight.js
index a4cbacd6e..6633c37aa 100644
--- a/src/stores/user_highlight.js
+++ b/src/stores/user_highlight.js
@@ -5,7 +5,7 @@ import {
   groupBy,
   isEqual,
   last,
-} from 'lodash'
+} from 'lodash-es'
 import { defineStore } from 'pinia'
 import { toRaw } from 'vue'
 
diff --git a/src/stores/users.js b/src/stores/users.js
index 7093e9e03..54c3faa50 100644
--- a/src/stores/users.js
+++ b/src/stores/users.js
@@ -1,5 +1,5 @@
 import Cookies from 'js-cookie'
-import { last } from 'lodash'
+import { last } from 'lodash-es'
 import { defineStore } from 'pinia'
 
 import { useAnnouncementsStore } from 'src/stores/announcements.js'
diff --git a/test/unit/specs/stores/statuses.spec.js b/test/unit/specs/stores/statuses.spec.js
index f4064ec9d..1d4537dbc 100644
--- a/test/unit/specs/stores/statuses.spec.js
+++ b/test/unit/specs/stores/statuses.spec.js
@@ -1,5 +1,5 @@
 import { createTestingPinia } from '@pinia/testing'
-import { snakeCase } from 'lodash'
+import { snakeCase } from 'lodash-es'
 import { setActivePinia } from 'pinia'
 
 import { useStatusesStore } from 'src/stores/statuses.js'
diff --git a/test/unit/specs/stores/sync_config.spec.js b/test/unit/specs/stores/sync_config.spec.js
index cd1cc8904..372d67b3b 100644
--- a/test/unit/specs/stores/sync_config.spec.js
+++ b/test/unit/specs/stores/sync_config.spec.js
@@ -1,4 +1,4 @@
-import { cloneDeep } from 'lodash'
+import { cloneDeep } from 'lodash-es'
 import { createPinia, setActivePinia } from 'pinia'
 
 import { useLocalConfigStore } from 'src/stores/local_config.js'
diff --git a/test/unit/specs/stores/users.spec.js b/test/unit/specs/stores/users.spec.js
index c44c749f3..702f3b31b 100644
--- a/test/unit/specs/stores/users.spec.js
+++ b/test/unit/specs/stores/users.spec.js
@@ -1,5 +1,5 @@
 import { createTestingPinia } from '@pinia/testing'
-import { snakeCase } from 'lodash'
+import { snakeCase } from 'lodash-es'
 import { setActivePinia } from 'pinia'
 
 import { useAnnouncementsStore } from 'src/stores/announcements.js'

From 1f20bd2f60788236c3695653f32d202acaed3c63 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Thu, 3 Sep 2026 13:41:12 +0300
Subject: [PATCH 06/18] more lodash-es

---
 package.json                                  |   2 +-
 .../post_status_modal/post_status_modal.js    |   2 +-
 .../status_poster/status_poster.service.js    |   2 +-
 yarn.lock                                     | 417 ++++++++++--------
 4 files changed, 242 insertions(+), 181 deletions(-)

diff --git a/package.json b/package.json
index 60f65b129..8f6a2a98f 100644
--- a/package.json
+++ b/package.json
@@ -42,6 +42,7 @@
     "hash-sum": "^2.0.0",
     "js-cookie": "3.0.5",
     "localforage": "1.10.0",
+    "lodash-es": "4.17.21",
     "parse-link-header": "2.0.0",
     "phoenix": "1.8.1",
     "pinia": "^3.0.4",
@@ -95,7 +96,6 @@
     "function-bind": "1.1.2",
     "http-proxy-middleware": "3.0.5",
     "iso-639-1": "3.1.5",
-    "lodash-es": "4.17.21",
     "msw": "2.14.6",
     "nightwatch": "3.12.2",
     "oxc": "^1.0.1",
diff --git a/src/components/post_status_modal/post_status_modal.js b/src/components/post_status_modal/post_status_modal.js
index b241d913c..1fcf934dd 100644
--- a/src/components/post_status_modal/post_status_modal.js
+++ b/src/components/post_status_modal/post_status_modal.js
@@ -1,4 +1,4 @@
-import { get } from 'lodash'
+import { get } from 'lodash-es'
 import { mapState } from 'pinia'
 
 import Modal from 'src/components/modal/modal.vue'
diff --git a/src/services/status_poster/status_poster.service.js b/src/services/status_poster/status_poster.service.js
index f7877be15..5aea155c3 100644
--- a/src/services/status_poster/status_poster.service.js
+++ b/src/services/status_poster/status_poster.service.js
@@ -1,4 +1,4 @@
-import { map } from 'lodash'
+import { map } from 'lodash-es'
 
 import { useOAuthStore } from 'src/stores/oauth.js'
 import { useStatusesStore } from 'src/stores/statuses.js'
diff --git a/yarn.lock b/yarn.lock
index 364949865..e7d6ebaa4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,13 +2,13 @@
 # yarn lockfile v1
 
 
-"@asamuzakjp/css-color@^3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@asamuzakjp/css-color/-/css-color-3.1.1.tgz#41a612834dafd9353b89855b37baa8a03fb67bf2"
-  integrity sha512-hpRD68SV2OMcZCsrbdkccTw5FXjNDLo5OuqSHyHZfwweGsDWZwDJ2+gONyNAbazZclobMirACLw0lk8WVxIqxA==
+"@asamuzakjp/css-color@^3.2.0":
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/@asamuzakjp/css-color/-/css-color-3.2.0.tgz#cc42f5b85c593f79f1fa4f25d2b9b321e61d1794"
+  integrity sha512-K1A6z8tS3XsmCMM86xoWdn7Fkdn9m6RSVtocUrJYIwZnFVkng/PvkEoWtOWmP+Scc6saYWHWZYbndEEXxl24jw==
   dependencies:
-    "@csstools/css-calc" "^2.1.2"
-    "@csstools/css-color-parser" "^3.0.8"
+    "@csstools/css-calc" "^2.1.3"
+    "@csstools/css-color-parser" "^3.0.9"
     "@csstools/css-parser-algorithms" "^3.0.4"
     "@csstools/css-tokenizer" "^3.0.3"
     lru-cache "^10.4.3"
@@ -1216,9 +1216,9 @@
     "@babel/helper-validator-identifier" "^7.29.7"
 
 "@bazel/runfiles@^6.3.1":
-  version "6.3.1"
-  resolved "https://registry.yarnpkg.com/@bazel/runfiles/-/runfiles-6.3.1.tgz#3f8824b2d82853377799d42354b4df78ab0ace0b"
-  integrity sha512-1uLNT5NZsUVIGS4syuHwTzZ8HycMPyr6POA3FCE4GbMtc4rhoJk8aZKtNIRthJYfL+iioppi+rTfH3olMPr9nA==
+  version "6.5.0"
+  resolved "https://registry.yarnpkg.com/@bazel/runfiles/-/runfiles-6.5.0.tgz#63cf7b77b91b54873e75f7a08fabec215c6888be"
+  integrity sha512-RzahvqTkfpY2jsDxo8YItPX+/iZ6hbiikw1YhE0bA9EKBR5Og8Pa6FHn9PO9M0zaXRVsr0GFQLKbB/0rzy9SzA==
 
 "@bcoe/v8-coverage@^1.0.2":
   version "1.0.2"
@@ -1421,40 +1421,30 @@
   resolved "https://registry.yarnpkg.com/@cropper/utils/-/utils-2.0.1.tgz#ef24496854be61c677c0e97951813ff9495844d6"
   integrity sha512-A9RnAFmgNF5aZk5q2VZnFnHtXWu1kPyEN0LVsX8wJ2LBRu2nyETKwz+ZXVsVWliktToCaYojHKrS+6/HODyEZA==
 
-"@csstools/color-helpers@^5.0.2":
-  version "5.0.2"
-  resolved "https://registry.yarnpkg.com/@csstools/color-helpers/-/color-helpers-5.0.2.tgz#82592c9a7c2b83c293d9161894e2a6471feb97b8"
-  integrity sha512-JqWH1vsgdGcw2RR6VliXXdA0/59LttzlU8UlRT/iUUsEeWfYq8I+K0yhihEUTTHLRm1EXvpsCx3083EU15ecsA==
+"@csstools/color-helpers@^5.1.0":
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/@csstools/color-helpers/-/color-helpers-5.1.0.tgz#106c54c808cabfd1ab4c602d8505ee584c2996ef"
+  integrity sha512-S11EXWJyy0Mz5SYvRmY8nJYTFFd1LCNV+7cXyAgQtOOuzb4EsgfqDufL+9esx72/eLhsRdGZwaldu/h+E4t4BA==
 
-"@csstools/css-calc@^2.1.2":
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/@csstools/css-calc/-/css-calc-2.1.2.tgz#bffd55f002dab119b76d4023f95cd943e6c8c11e"
-  integrity sha512-TklMyb3uBB28b5uQdxjReG4L80NxAqgrECqLZFQbyLekwwlcDDS8r3f07DKqeo8C4926Br0gf/ZDe17Zv4wIuw==
+"@csstools/css-calc@^2.1.3", "@csstools/css-calc@^2.1.4":
+  version "2.1.4"
+  resolved "https://registry.yarnpkg.com/@csstools/css-calc/-/css-calc-2.1.4.tgz#8473f63e2fcd6e459838dd412401d5948f224c65"
+  integrity sha512-3N8oaj+0juUw/1H3YwmDDJXCgTB1gKU6Hc/bB502u9zR0q2vd786XJH9QfrKIEgFlZmhZiq6epXl4rHqhzsIgQ==
 
-"@csstools/css-color-parser@^3.0.8":
-  version "3.0.8"
-  resolved "https://registry.yarnpkg.com/@csstools/css-color-parser/-/css-color-parser-3.0.8.tgz#5fe9322920851450bf5e065c2b0e731b9e165394"
-  integrity sha512-pdwotQjCCnRPuNi06jFuP68cykU1f3ZWExLe/8MQ1LOs8Xq+fTkYgd+2V8mWUWMrOn9iS2HftPVaMZDaXzGbhQ==
+"@csstools/css-color-parser@^3.0.9":
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/@csstools/css-color-parser/-/css-color-parser-3.1.0.tgz#4e386af3a99dd36c46fef013cfe4c1c341eed6f0"
+  integrity sha512-nbtKwh3a6xNVIp/VRuXV64yTKnb1IjTAEEh3irzS+HkKjAOYLTGNb9pmVNntZ8iVBHcWDA2Dof0QtPgFI1BaTA==
   dependencies:
-    "@csstools/color-helpers" "^5.0.2"
-    "@csstools/css-calc" "^2.1.2"
+    "@csstools/color-helpers" "^5.1.0"
+    "@csstools/css-calc" "^2.1.4"
 
-"@csstools/css-parser-algorithms@^3.0.4":
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/@csstools/css-parser-algorithms/-/css-parser-algorithms-3.0.4.tgz#74426e93bd1c4dcab3e441f5cc7ba4fb35d94356"
-  integrity sha512-Up7rBoV77rv29d3uKHUIVubz1BTcgyUK72IvCQAbfbMv584xHcGKCKbWh7i8hPrRJ7qU4Y8IO3IY9m+iTB7P3A==
-
-"@csstools/css-parser-algorithms@^3.0.5":
+"@csstools/css-parser-algorithms@^3.0.4", "@csstools/css-parser-algorithms@^3.0.5":
   version "3.0.5"
   resolved "https://registry.yarnpkg.com/@csstools/css-parser-algorithms/-/css-parser-algorithms-3.0.5.tgz#5755370a9a29abaec5515b43c8b3f2cf9c2e3076"
   integrity sha512-DaDeUkXZKjdGhgYaHNJTV9pV7Y9B3b644jCLs9Upc3VeNGg6LWARAT6O+Q+/COo+2gg/bM5rhpMAtf70WqfBdQ==
 
-"@csstools/css-tokenizer@^3.0.3":
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/@csstools/css-tokenizer/-/css-tokenizer-3.0.3.tgz#a5502c8539265fecbd873c1e395a890339f119c2"
-  integrity sha512-UJnjoFsmxfKUdNYdWgOB0mWUypuLvAfQPH1+pyvRJs6euowbFkFC6P13w1l8mJyi3vxYMxc9kld5jZEGRQs6bw==
-
-"@csstools/css-tokenizer@^3.0.4":
+"@csstools/css-tokenizer@^3.0.3", "@csstools/css-tokenizer@^3.0.4":
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/@csstools/css-tokenizer/-/css-tokenizer-3.0.4.tgz#333fedabc3fd1a8e5d0100013731cf19e6a8c5d3"
   integrity sha512-Vd/9EVDiu6PPJt9yAh6roZP6El1xHrdvIVGjyBsHR0RYwNHgL7FJPyIIW4fANJNG6FtyZfvlRPpFI4ZM/lubvw==
@@ -1808,107 +1798,113 @@
     outvariant "^1.4.3"
     strict-event-emitter "^0.5.1"
 
-"@napi-rs/nice-android-arm-eabi@1.0.1":
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/@napi-rs/nice-android-arm-eabi/-/nice-android-arm-eabi-1.0.1.tgz#9a0cba12706ff56500df127d6f4caf28ddb94936"
-  integrity sha512-5qpvOu5IGwDo7MEKVqqyAxF90I6aLj4n07OzpARdgDRfz8UbBztTByBp0RC59r3J1Ij8uzYi6jI7r5Lws7nn6w==
+"@napi-rs/nice-android-arm-eabi@1.1.1":
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@napi-rs/nice-android-arm-eabi/-/nice-android-arm-eabi-1.1.1.tgz#4ebd966821cd6c2cc7cc020eb468de397bb9b40f"
+  integrity sha512-kjirL3N6TnRPv5iuHw36wnucNqXAO46dzK9oPb0wj076R5Xm8PfUVA9nAFB5ZNMmfJQJVKACAPd/Z2KYMppthw==
 
-"@napi-rs/nice-android-arm64@1.0.1":
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/@napi-rs/nice-android-arm64/-/nice-android-arm64-1.0.1.tgz#32fc32e9649bd759d2a39ad745e95766f6759d2f"
-  integrity sha512-GqvXL0P8fZ+mQqG1g0o4AO9hJjQaeYG84FRfZaYjyJtZZZcMjXW5TwkL8Y8UApheJgyE13TQ4YNUssQaTgTyvA==
+"@napi-rs/nice-android-arm64@1.1.1":
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@napi-rs/nice-android-arm64/-/nice-android-arm64-1.1.1.tgz#e183ba874512bc005852daab8b78c63e0a4288a8"
+  integrity sha512-blG0i7dXgbInN5urONoUCNf+DUEAavRffrO7fZSeoRMJc5qD+BJeNcpr54msPF6qfDD6kzs9AQJogZvT2KD5nw==
 
-"@napi-rs/nice-darwin-arm64@1.0.1":
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/@napi-rs/nice-darwin-arm64/-/nice-darwin-arm64-1.0.1.tgz#d3c44c51b94b25a82d45803e2255891e833e787b"
-  integrity sha512-91k3HEqUl2fsrz/sKkuEkscj6EAj3/eZNCLqzD2AA0TtVbkQi8nqxZCZDMkfklULmxLkMxuUdKe7RvG/T6s2AA==
+"@napi-rs/nice-darwin-arm64@1.1.1":
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@napi-rs/nice-darwin-arm64/-/nice-darwin-arm64-1.1.1.tgz#64b1585809774cbb8bf95cea3d4c8827c9897394"
+  integrity sha512-s/E7w45NaLqTGuOjC2p96pct4jRfo61xb9bU1unM/MJ/RFkKlJyJDx7OJI/O0ll/hrfpqKopuAFDV8yo0hfT7A==
 
-"@napi-rs/nice-darwin-x64@1.0.1":
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/@napi-rs/nice-darwin-x64/-/nice-darwin-x64-1.0.1.tgz#f1b1365a8370c6a6957e90085a9b4873d0e6a957"
-  integrity sha512-jXnMleYSIR/+TAN/p5u+NkCA7yidgswx5ftqzXdD5wgy/hNR92oerTXHc0jrlBisbd7DpzoaGY4cFD7Sm5GlgQ==
+"@napi-rs/nice-darwin-x64@1.1.1":
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@napi-rs/nice-darwin-x64/-/nice-darwin-x64-1.1.1.tgz#99c0c7f62cb1e23ca76881bb29cc6000aeccc6f0"
+  integrity sha512-dGoEBnVpsdcC+oHHmW1LRK5eiyzLwdgNQq3BmZIav+9/5WTZwBYX7r5ZkQC07Nxd3KHOCkgbHSh4wPkH1N1LiQ==
 
-"@napi-rs/nice-freebsd-x64@1.0.1":
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/@napi-rs/nice-freebsd-x64/-/nice-freebsd-x64-1.0.1.tgz#4280f081efbe0b46c5165fdaea8b286e55a8f89e"
-  integrity sha512-j+iJ/ezONXRQsVIB/FJfwjeQXX7A2tf3gEXs4WUGFrJjpe/z2KB7sOv6zpkm08PofF36C9S7wTNuzHZ/Iiccfw==
+"@napi-rs/nice-freebsd-x64@1.1.1":
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@napi-rs/nice-freebsd-x64/-/nice-freebsd-x64-1.1.1.tgz#9a5ca0e3ced86207887c98a5a560de8cde5a909e"
+  integrity sha512-kHv4kEHAylMYmlNwcQcDtXjklYp4FCf0b05E+0h6nDHsZ+F0bDe04U/tXNOqrx5CmIAth4vwfkjjUmp4c4JktQ==
 
-"@napi-rs/nice-linux-arm-gnueabihf@1.0.1":
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/@napi-rs/nice-linux-arm-gnueabihf/-/nice-linux-arm-gnueabihf-1.0.1.tgz#07aec23a9467ed35eb7602af5e63d42c5d7bd473"
-  integrity sha512-G8RgJ8FYXYkkSGQwywAUh84m946UTn6l03/vmEXBYNJxQJcD+I3B3k5jmjFG/OPiU8DfvxutOP8bi+F89MCV7Q==
+"@napi-rs/nice-linux-arm-gnueabihf@1.1.1":
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@napi-rs/nice-linux-arm-gnueabihf/-/nice-linux-arm-gnueabihf-1.1.1.tgz#b8a6a1bc88d0de3e99ac3fdea69980dc6e20b502"
+  integrity sha512-E1t7K0efyKXZDoZg1LzCOLxgolxV58HCkaEkEvIYQx12ht2pa8hoBo+4OB3qh7e+QiBlp1SRf+voWUZFxyhyqg==
 
-"@napi-rs/nice-linux-arm64-gnu@1.0.1":
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/@napi-rs/nice-linux-arm64-gnu/-/nice-linux-arm64-gnu-1.0.1.tgz#038a77134cc6df3c48059d5a5e199d6f50fb9a90"
-  integrity sha512-IMDak59/W5JSab1oZvmNbrms3mHqcreaCeClUjwlwDr0m3BoR09ZiN8cKFBzuSlXgRdZ4PNqCYNeGQv7YMTjuA==
+"@napi-rs/nice-linux-arm64-gnu@1.1.1":
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@napi-rs/nice-linux-arm64-gnu/-/nice-linux-arm64-gnu-1.1.1.tgz#226f1ef30fcb80fa40370e843b75cc86e39e1183"
+  integrity sha512-CIKLA12DTIZlmTaaKhQP88R3Xao+gyJxNWEn04wZwC2wmRapNnxCUZkVwggInMJvtVElA+D4ZzOU5sX4jV+SmQ==
 
-"@napi-rs/nice-linux-arm64-musl@1.0.1":
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/@napi-rs/nice-linux-arm64-musl/-/nice-linux-arm64-musl-1.0.1.tgz#715d0906582ba0cff025109f42e5b84ea68c2bcc"
-  integrity sha512-wG8fa2VKuWM4CfjOjjRX9YLIbysSVV1S3Kgm2Fnc67ap/soHBeYZa6AGMeR5BJAylYRjnoVOzV19Cmkco3QEPw==
+"@napi-rs/nice-linux-arm64-musl@1.1.1":
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@napi-rs/nice-linux-arm64-musl/-/nice-linux-arm64-musl-1.1.1.tgz#01345c3db79210ba5406c8729e8db75ed11c5f14"
+  integrity sha512-+2Rzdb3nTIYZ0YJF43qf2twhqOCkiSrHx2Pg6DJaCPYhhaxbLcdlV8hCRMHghQ+EtZQWGNcS2xF4KxBhSGeutg==
 
-"@napi-rs/nice-linux-ppc64-gnu@1.0.1":
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/@napi-rs/nice-linux-ppc64-gnu/-/nice-linux-ppc64-gnu-1.0.1.tgz#ac1c8f781c67b0559fa7a1cd4ae3ca2299dc3d06"
-  integrity sha512-lxQ9WrBf0IlNTCA9oS2jg/iAjQyTI6JHzABV664LLrLA/SIdD+I1i3Mjf7TsnoUbgopBcCuDztVLfJ0q9ubf6Q==
+"@napi-rs/nice-linux-ppc64-gnu@1.1.1":
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@napi-rs/nice-linux-ppc64-gnu/-/nice-linux-ppc64-gnu-1.1.1.tgz#ce7a1025227daab491ded40784b561394d688fcb"
+  integrity sha512-4FS8oc0GeHpwvv4tKciKkw3Y4jKsL7FRhaOeiPei0X9T4Jd619wHNe4xCLmN2EMgZoeGg+Q7GY7BsvwKpL22Tg==
 
-"@napi-rs/nice-linux-riscv64-gnu@1.0.1":
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/@napi-rs/nice-linux-riscv64-gnu/-/nice-linux-riscv64-gnu-1.0.1.tgz#b0a430549acfd3920ffd28ce544e2fe17833d263"
-  integrity sha512-3xs69dO8WSWBb13KBVex+yvxmUeEsdWexxibqskzoKaWx9AIqkMbWmE2npkazJoopPKX2ULKd8Fm9veEn0g4Ig==
+"@napi-rs/nice-linux-riscv64-gnu@1.1.1":
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@napi-rs/nice-linux-riscv64-gnu/-/nice-linux-riscv64-gnu-1.1.1.tgz#9bef5dc89a0425d03163853b4968dbb686d98fd5"
+  integrity sha512-HU0nw9uD4FO/oGCCk409tCi5IzIZpH2agE6nN4fqpwVlCn5BOq0MS1dXGjXaG17JaAvrlpV5ZeyZwSon10XOXw==
 
-"@napi-rs/nice-linux-s390x-gnu@1.0.1":
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/@napi-rs/nice-linux-s390x-gnu/-/nice-linux-s390x-gnu-1.0.1.tgz#5b95caf411ad72a965885217db378c4d09733e97"
-  integrity sha512-lMFI3i9rlW7hgToyAzTaEybQYGbQHDrpRkg+1gJWEpH0PLAQoZ8jiY0IzakLfNWnVda1eTYYlxxFYzW8Rqczkg==
+"@napi-rs/nice-linux-s390x-gnu@1.1.1":
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@napi-rs/nice-linux-s390x-gnu/-/nice-linux-s390x-gnu-1.1.1.tgz#247c8c7c45876877bdb337cfeb290ff4fd82de62"
+  integrity sha512-2YqKJWWl24EwrX0DzCQgPLKQBxYDdBxOHot1KWEq7aY2uYeX+Uvtv4I8xFVVygJDgf6/92h9N3Y43WPx8+PAgQ==
 
-"@napi-rs/nice-linux-x64-gnu@1.0.1":
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/@napi-rs/nice-linux-x64-gnu/-/nice-linux-x64-gnu-1.0.1.tgz#a98cdef517549f8c17a83f0236a69418a90e77b7"
-  integrity sha512-XQAJs7DRN2GpLN6Fb+ZdGFeYZDdGl2Fn3TmFlqEL5JorgWKrQGRUrpGKbgZ25UeZPILuTKJ+OowG2avN8mThBA==
+"@napi-rs/nice-linux-x64-gnu@1.1.1":
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@napi-rs/nice-linux-x64-gnu/-/nice-linux-x64-gnu-1.1.1.tgz#7fd1f5e037cb44ab4f5f95a3b3225a99e3248f12"
+  integrity sha512-/gaNz3R92t+dcrfCw/96pDopcmec7oCcAQ3l/M+Zxr82KT4DljD37CpgrnXV+pJC263JkW572pdbP3hP+KjcIg==
 
-"@napi-rs/nice-linux-x64-musl@1.0.1":
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/@napi-rs/nice-linux-x64-musl/-/nice-linux-x64-musl-1.0.1.tgz#5e26843eafa940138aed437c870cca751c8a8957"
-  integrity sha512-/rodHpRSgiI9o1faq9SZOp/o2QkKQg7T+DK0R5AkbnI/YxvAIEHf2cngjYzLMQSQgUhxym+LFr+UGZx4vK4QdQ==
+"@napi-rs/nice-linux-x64-musl@1.1.1":
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@napi-rs/nice-linux-x64-musl/-/nice-linux-x64-musl-1.1.1.tgz#d447cd7157ae5da5c0b15fc618bf61f0c344ff6f"
+  integrity sha512-xScCGnyj/oppsNPMnevsBe3pvNaoK7FGvMjT35riz9YdhB2WtTG47ZlbxtOLpjeO9SqqQ2J2igCmz6IJOD5JYw==
 
-"@napi-rs/nice-win32-arm64-msvc@1.0.1":
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/@napi-rs/nice-win32-arm64-msvc/-/nice-win32-arm64-msvc-1.0.1.tgz#bd62617d02f04aa30ab1e9081363856715f84cd8"
-  integrity sha512-rEcz9vZymaCB3OqEXoHnp9YViLct8ugF+6uO5McifTedjq4QMQs3DHz35xBEGhH3gJWEsXMUbzazkz5KNM5YUg==
+"@napi-rs/nice-openharmony-arm64@1.1.1":
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@napi-rs/nice-openharmony-arm64/-/nice-openharmony-arm64-1.1.1.tgz#1120e457d2cc6b2bc86ef0a697faefe2e194dfce"
+  integrity sha512-6uJPRVwVCLDeoOaNyeiW0gp2kFIM4r7PL2MczdZQHkFi9gVlgm+Vn+V6nTWRcu856mJ2WjYJiumEajfSm7arPQ==
 
-"@napi-rs/nice-win32-ia32-msvc@1.0.1":
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/@napi-rs/nice-win32-ia32-msvc/-/nice-win32-ia32-msvc-1.0.1.tgz#b8b7aad552a24836027473d9b9f16edaeabecf18"
-  integrity sha512-t7eBAyPUrWL8su3gDxw9xxxqNwZzAqKo0Szv3IjVQd1GpXXVkb6vBBQUuxfIYaXMzZLwlxRQ7uzM2vdUE9ULGw==
+"@napi-rs/nice-win32-arm64-msvc@1.1.1":
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@napi-rs/nice-win32-arm64-msvc/-/nice-win32-arm64-msvc-1.1.1.tgz#91e4cfecf339b43fa7934f0c8b19d04f4cdd9bc0"
+  integrity sha512-uoTb4eAvM5B2aj/z8j+Nv8OttPf2m+HVx3UjA5jcFxASvNhQriyCQF1OB1lHL43ZhW+VwZlgvjmP5qF3+59atA==
 
-"@napi-rs/nice-win32-x64-msvc@1.0.1":
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/@napi-rs/nice-win32-x64-msvc/-/nice-win32-x64-msvc-1.0.1.tgz#37d8718b8f722f49067713e9f1e85540c9a3dd09"
-  integrity sha512-JlF+uDcatt3St2ntBG8H02F1mM45i5SF9W+bIKiReVE6wiy3o16oBP/yxt+RZ+N6LbCImJXJ6bXNO2kn9AXicg==
+"@napi-rs/nice-win32-ia32-msvc@1.1.1":
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@napi-rs/nice-win32-ia32-msvc/-/nice-win32-ia32-msvc-1.1.1.tgz#ed9300bba074d3e3b0a077d6b157f2b4ff70af0e"
+  integrity sha512-CNQqlQT9MwuCsg1Vd/oKXiuH+TcsSPJmlAFc5frFyX/KkOh0UpBLEj7aoY656d5UKZQMQFP7vJNa1DNUNORvug==
+
+"@napi-rs/nice-win32-x64-msvc@1.1.1":
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@napi-rs/nice-win32-x64-msvc/-/nice-win32-x64-msvc-1.1.1.tgz#8292b82fb46458618ccff5b8130f78974349541e"
+  integrity sha512-vB+4G/jBQCAh0jelMTY3+kgFy00Hlx2f2/1zjMoH821IbplbWZOkLiTYXQkygNTzQJTq5cvwBDgn2ppHD+bglQ==
 
 "@napi-rs/nice@^1.0.1":
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/@napi-rs/nice/-/nice-1.0.1.tgz#483d3ff31e5661829a1efb4825591a135c3bfa7d"
-  integrity sha512-zM0mVWSXE0a0h9aKACLwKmD6nHcRiKrPpCfvaKqG1CqDEyjEawId0ocXxVzPMCAm6kkWr2P025msfxXEnt8UGQ==
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@napi-rs/nice/-/nice-1.1.1.tgz#c1aacd631ecd4c500c959e3e7cfedd5c73bffe2a"
+  integrity sha512-xJIPs+bYuc9ASBl+cvGsKbGrJmS6fAKaSZCnT0lhahT5rhA2VVy9/EcIgd2JhtEuFOJNx7UHNn/qiTPTY4nrQw==
   optionalDependencies:
-    "@napi-rs/nice-android-arm-eabi" "1.0.1"
-    "@napi-rs/nice-android-arm64" "1.0.1"
-    "@napi-rs/nice-darwin-arm64" "1.0.1"
-    "@napi-rs/nice-darwin-x64" "1.0.1"
-    "@napi-rs/nice-freebsd-x64" "1.0.1"
-    "@napi-rs/nice-linux-arm-gnueabihf" "1.0.1"
-    "@napi-rs/nice-linux-arm64-gnu" "1.0.1"
-    "@napi-rs/nice-linux-arm64-musl" "1.0.1"
-    "@napi-rs/nice-linux-ppc64-gnu" "1.0.1"
-    "@napi-rs/nice-linux-riscv64-gnu" "1.0.1"
-    "@napi-rs/nice-linux-s390x-gnu" "1.0.1"
-    "@napi-rs/nice-linux-x64-gnu" "1.0.1"
-    "@napi-rs/nice-linux-x64-musl" "1.0.1"
-    "@napi-rs/nice-win32-arm64-msvc" "1.0.1"
-    "@napi-rs/nice-win32-ia32-msvc" "1.0.1"
-    "@napi-rs/nice-win32-x64-msvc" "1.0.1"
+    "@napi-rs/nice-android-arm-eabi" "1.1.1"
+    "@napi-rs/nice-android-arm64" "1.1.1"
+    "@napi-rs/nice-darwin-arm64" "1.1.1"
+    "@napi-rs/nice-darwin-x64" "1.1.1"
+    "@napi-rs/nice-freebsd-x64" "1.1.1"
+    "@napi-rs/nice-linux-arm-gnueabihf" "1.1.1"
+    "@napi-rs/nice-linux-arm64-gnu" "1.1.1"
+    "@napi-rs/nice-linux-arm64-musl" "1.1.1"
+    "@napi-rs/nice-linux-ppc64-gnu" "1.1.1"
+    "@napi-rs/nice-linux-riscv64-gnu" "1.1.1"
+    "@napi-rs/nice-linux-s390x-gnu" "1.1.1"
+    "@napi-rs/nice-linux-x64-gnu" "1.1.1"
+    "@napi-rs/nice-linux-x64-musl" "1.1.1"
+    "@napi-rs/nice-openharmony-arm64" "1.1.1"
+    "@napi-rs/nice-win32-arm64-msvc" "1.1.1"
+    "@napi-rs/nice-win32-ia32-msvc" "1.1.1"
+    "@napi-rs/nice-win32-x64-msvc" "1.1.1"
 
 "@napi-rs/wasm-runtime@^1.1.4":
   version "1.1.4"
@@ -2433,9 +2429,9 @@
     undici-types "~6.20.0"
 
 "@types/selenium-webdriver@^4.1.14":
-  version "4.1.28"
-  resolved "https://registry.yarnpkg.com/@types/selenium-webdriver/-/selenium-webdriver-4.1.28.tgz#7b4f3c50a67494f8fd6d396a2eaab7d9df1f9f34"
-  integrity sha512-Au7CXegiS7oapbB16zxPToY4Cjzi9UQQMf3W2ZZM8PigMLTGR3iUAHjPUTddyE5g1SBjT/qpmvlsAQLBfNAdKg==
+  version "4.35.6"
+  resolved "https://registry.yarnpkg.com/@types/selenium-webdriver/-/selenium-webdriver-4.35.6.tgz#28acbfaa35d417d730d04a5a59def50bad558387"
+  integrity sha512-8nfyMRi4VvkY9QrQGyY/zkleAhnjnmE8YtdEeoCrWe3izp1P9vo9f5VTNRYF0up+l+kn+VuZah+je+bLddNV+g==
   dependencies:
     "@types/node" "*"
     "@types/ws" "*"
@@ -3302,7 +3298,7 @@ async-function@^1.0.0:
   resolved "https://registry.yarnpkg.com/async-function/-/async-function-1.0.0.tgz#509c9fca60eaf85034c6829838188e4e4c8ffb2b"
   integrity sha512-hsU18Ae8CDTR6Kgu9DYf0EbCr/a5iGL0rytQDobUcdpYOKokk8LEjVphnXkDkgpi0wYVsqrXuP0bZxJaTqdgoA==
 
-async@^3.2.3, async@^3.2.4:
+async@^3.2.4, async@^3.2.6:
   version "3.2.6"
   resolved "https://registry.yarnpkg.com/async/-/async-3.2.6.tgz#1b0728e14929d51b85b449b7f06e27c1145e38ce"
   integrity sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA==
@@ -3331,10 +3327,10 @@ available-typed-arrays@^1.0.7:
   dependencies:
     possible-typed-array-names "^1.0.0"
 
-axe-core@^4.9.1:
-  version "4.10.3"
-  resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.10.3.tgz#04145965ac7894faddbac30861e5d8f11bfd14fc"
-  integrity sha512-Xm7bpRXnDSX2YE2YFfBk2FnF0ep6tmG7xPh8iHee8MIcrgq762Nkce856dYtJYLkuIoYZvGfTs/PbZhideTcEg==
+axe-core@^4.11.1:
+  version "4.13.0"
+  resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.13.0.tgz#f868ecb1bd61d982321760e51d841ab497ab86d0"
+  integrity sha512-UzGt8zg7Ny8djbYMhxl2zuEevVa7r2gJjYY5Lwr1xM7+XU2nd6CkIWFTVcCIbAP63vSz71NaVyyuSk9lHKcy0A==
 
 axios@^1.7.4:
   version "1.8.4"
@@ -3556,7 +3552,17 @@ call-bind-apply-helpers@^1.0.0, call-bind-apply-helpers@^1.0.1, call-bind-apply-
     es-errors "^1.3.0"
     function-bind "^1.1.2"
 
-call-bind@^1.0.2, call-bind@^1.0.5, call-bind@^1.0.7, call-bind@^1.0.8:
+call-bind@^1.0.2, call-bind@^1.0.5, call-bind@^1.0.9:
+  version "1.0.9"
+  resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.9.tgz#39a644700c80bc7d0ca9102fc6d1d43b2fd7eee7"
+  integrity sha512-a/hy+pNsFUTR+Iz8TCJvXudKVLAnz/DyeSUo10I5yvFDQJBFU2s9uqQpoSrJlroHUKoKqzg+epxyP9lqFdzfBQ==
+  dependencies:
+    call-bind-apply-helpers "^1.0.2"
+    es-define-property "^1.0.1"
+    get-intrinsic "^1.3.0"
+    set-function-length "^1.2.2"
+
+call-bind@^1.0.7, call-bind@^1.0.8:
   version "1.0.8"
   resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.8.tgz#0736a9660f537e3388826f440d5ec45f744eaa4c"
   integrity sha512-oKlSFMcMwpUg2ednkhQ454wfWiU/ul3CkJe/PEHcTKuiX6RpbehUiFMXu13HalGZxfUwCQzZG747YXBn1im9ww==
@@ -3641,7 +3647,7 @@ chalk@5.6.2:
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-5.6.2.tgz#b1238b6e23ea337af71c7f8a295db5af0c158aea"
   integrity sha512-7NzBL0rN6fMUW+f7A6Io4h40qQlG+xGmtMxfbnH/K7TAtt8JQWVQK+6g0UXKMeVJoyV5EkkNsErQ8pVD3bLHbA==
 
-chalk@^4.0.0, chalk@^4.0.2, chalk@^4.1.0, chalk@^4.1.2:
+chalk@^4.0.0, chalk@^4.1.0, 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==
@@ -3992,11 +3998,11 @@ cssesc@^3.0.0:
   integrity sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==
 
 cssstyle@^4.0.1:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-4.3.0.tgz#83db22d1aec8eb7e5ecd812b4d14a17fb3dd243d"
-  integrity sha512-6r0NiY0xizYqfBvWp1G7WXJ06/bZyrk7Dc6PHql82C/pKGUTKu4yAX4Y8JPamb1ob9nBKuxWzCGTRuGwU3yxJQ==
+  version "4.6.0"
+  resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-4.6.0.tgz#ea18007024e3167f4f105315f3ec2d982bf48ed9"
+  integrity sha512-2z+rWdzbbSZv6/rhtvzvqeZQHrBaqgogqt85sqFNbabZOuFbCVFb8kPeEtZjiKkbrm395irpNKiYeFeLiQnFPg==
   dependencies:
-    "@asamuzakjp/css-color" "^3.1.1"
+    "@asamuzakjp/css-color" "^3.2.0"
     rrweb-cssom "^0.8.0"
 
 csstype@^3.1.3:
@@ -4119,9 +4125,9 @@ decamelize@^4.0.0:
   integrity sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ==
 
 decimal.js@^10.4.3:
-  version "10.5.0"
-  resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.5.0.tgz#0f371c7cf6c4898ce0afb09836db73cd82010f22"
-  integrity sha512-8vDa8Qxvr/+d94hSh5P3IJwI5t8/c0KsMp+g8bNw9cY2icONa5aPfvKeieW1WlG0WQYwwhJ7mjui2xtiePQSXw==
+  version "10.6.0"
+  resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.6.0.tgz#e649a43e3ab953a72192ff5983865e509f37ed9a"
+  integrity sha512-YpgQiITW3JXGntzdUmyUR1V812Hn8T1YVXhCu+wO3OpS4eU9l4YdD3qjyiKdV6mvV29zapkMeD390UVEf2lkUg==
 
 deep-eql@4.0.1:
   version "4.0.1"
@@ -4383,13 +4389,20 @@ encodeurl@^2.0.0:
   resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-2.0.0.tgz#7b8ea898077d7e409d3ac45474ea38eaf0857a58"
   integrity sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==
 
-end-of-stream@^1.1.0, end-of-stream@^1.4.1:
+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"
   integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==
   dependencies:
     once "^1.4.0"
 
+end-of-stream@^1.4.1:
+  version "1.4.5"
+  resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.5.tgz#7344d711dea40e0b74abc2ed49778743ccedb08c"
+  integrity sha512-ooEGc6HP26xXq/N+GCGOT0JKCLDGrq2bQUZrQ7gyrJiZANJ/8YDTxTpQBXGMn+WbIQXNVpyWymm7KYVICQnyOg==
+  dependencies:
+    once "^1.4.0"
+
 enhanced-resolve@^5.17.1:
   version "5.18.1"
   resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.18.1.tgz#728ab082f8b7b6836de51f1637aab5d3b9568faf"
@@ -4408,6 +4421,11 @@ entities@^4.2.0, entities@^4.4.0, entities@^4.5.0:
   resolved "https://registry.yarnpkg.com/entities/-/entities-4.5.0.tgz#5d268ea5e7113ec74c4d033b79ea5a35a488fb48"
   integrity sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==
 
+entities@^6.0.0:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/entities/-/entities-6.0.1.tgz#c28c34a43379ca7f61d074130b2f5f7020a30694"
+  integrity sha512-aN97NXWF6AWBTahfVOIrB/NShkzi5H7F9r1s9mD3cDj4Ko5f2qhhVoYMibXF7GlLveb/D2ioWay8lxI97Ven3g==
+
 entities@^7.0.1:
   version "7.0.1"
   resolved "https://registry.yarnpkg.com/entities/-/entities-7.0.1.tgz#26e8a88889db63417dcb9a1e79a3f1bc92b5976b"
@@ -5074,9 +5092,9 @@ file-entry-cache@^8.0.0:
     flat-cache "^4.0.0"
 
 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==
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/filelist/-/filelist-1.0.6.tgz#1e8870942a7c636c862f7c49b9394937b6a995a3"
+  integrity sha512-5giy2PkLYY1cP39p17Ech+2xlpTRL9HLspOfEgm0L6CwBXBTgsK5ou0JtzYuepxkaQ/tvhCFIJ5uXo0OrM2DxA==
   dependencies:
     minimatch "^5.0.1"
 
@@ -6072,14 +6090,13 @@ jackspeak@^3.1.2:
     "@pkgjs/parseargs" "^0.11.0"
 
 jake@^10.8.5:
-  version "10.9.2"
-  resolved "https://registry.yarnpkg.com/jake/-/jake-10.9.2.tgz#6ae487e6a69afec3a5e167628996b59f35ae2b7f"
-  integrity sha512-2P4SQ0HrLQ+fw6llpLnOaGAvN2Zu6778SJMrCUwns4fOoG9ayrTiZk3VV8sCPkVZF8ab0zksVpS8FDY5pRCNBA==
+  version "10.9.4"
+  resolved "https://registry.yarnpkg.com/jake/-/jake-10.9.4.tgz#d626da108c63d5cfb00ab5c25fadc7e0084af8e6"
+  integrity sha512-wpHYzhxiVQL+IV05BLE2Xn34zW1S223hvjtqk0+gsPrwd/8JNLXJgZZM/iPFsYc1xyphF+6M6EvdE5E9MBGkDA==
   dependencies:
-    async "^3.2.3"
-    chalk "^4.0.2"
+    async "^3.2.6"
     filelist "^1.0.4"
-    minimatch "^3.1.2"
+    picocolors "^1.1.1"
 
 jiti@^2.6.1:
   version "2.7.0"
@@ -6430,9 +6447,9 @@ lodash.union@^4.6.0:
   integrity sha512-c4pB2CdGrGdjMKYLA+XiRDO7Y0PRQbm/Gzg8qMj+QH+pFVAoTp5sBpO0odL3FjoPCGjK96p6qsP+yQoiLoOBcw==
 
 lodash@^4.17.21:
-  version "4.17.21"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
-  integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
+  version "4.18.1"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.18.1.tgz#ff2b66c1f6326d59513de2407bf881439812771c"
+  integrity sha512-dMInicTPVE8d1e5otfwmmjlxkZoUpiVLwyeTdUsi/Caj/gfzzblBcCE5sRHV/AsjuCmxWrte2TNGSYuCeCq+0Q==
 
 log-symbols@4.1.0, log-symbols@^4.1.0:
   version "4.1.0"
@@ -6610,7 +6627,7 @@ mimic-fn@^2.1.0:
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
   integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==
 
-minimatch@3.1.2, minimatch@^3.1.1, minimatch@^3.1.2:
+minimatch@3.1.2, minimatch@^3.1.2:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
   integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
@@ -6631,10 +6648,17 @@ minimatch@9.0.1:
   dependencies:
     brace-expansion "^2.0.1"
 
+minimatch@^3.1.1:
+  version "3.1.5"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.5.tgz#580c88f8d5445f2bd6aa8f3cadefa0de79fbd69e"
+  integrity sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==
+  dependencies:
+    brace-expansion "^1.1.7"
+
 minimatch@^5.0.1, minimatch@^5.1.0:
-  version "5.1.6"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.6.tgz#1cfcb8cf5522ea69952cd2af95ae09477f122a96"
-  integrity sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==
+  version "5.1.9"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.9.tgz#1293ef15db0098b394540e8f9f744f9fda8dee4b"
+  integrity sha512-7o1wEA2RyMP7Iu7GNba9vc0RWWGACJOCZBJX2GJWip0ikV+wcOsgVuY9uE8CPiyQhkGFSlhuSkZPavN7u1c2Fw==
   dependencies:
     brace-expansion "^2.0.1"
 
@@ -6781,11 +6805,11 @@ netmask@^2.0.2:
   integrity sha512-dBpDMdxv9Irdq66304OLfEmQ9tbNRFnFTuZiLo+bD+r332bBmMJ8GBLXklIXXgxd3+v9+KUnZaUR5PJMa75Gsg==
 
 nightwatch-axe-verbose@^2.3.0:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/nightwatch-axe-verbose/-/nightwatch-axe-verbose-2.3.1.tgz#42cd226989cb5205b699db42d74b1b967587d099"
-  integrity sha512-C6N95bwPHsRnv04eVIwJ6w5m6X1+Pddvo6nzpzOHQlO0j+pYRVU7zaQmFUJ0L4cqeUxReNEXyTUg/R9WWfHk7w==
+  version "2.5.1"
+  resolved "https://registry.yarnpkg.com/nightwatch-axe-verbose/-/nightwatch-axe-verbose-2.5.1.tgz#6bed281a4b3ba902f70c761d51e36f7177dcc99d"
+  integrity sha512-vvLUMyIbGHB8CA5XEGfliPstNCplcHeMn/CWi4cyg0CWMqWypGrV2IgP+WmiWpUgs0qvPmqVHeRHf0BTT7Ez2Q==
   dependencies:
-    axe-core "^4.9.1"
+    axe-core "^4.11.1"
 
 nightwatch@3.12.2:
   version "3.12.2"
@@ -6888,9 +6912,9 @@ nth-check@^2.1.1:
     boolbase "^1.0.0"
 
 nwsapi@^2.2.12:
-  version "2.2.20"
-  resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.20.tgz#22e53253c61e7b0e7e93cef42c891154bcca11ef"
-  integrity sha512-/ieB+mDe4MrrKMT8z+mQL8klXydZWGR5Dowt4RAGKbJ3kIGEx3X4ljUo+6V73IXtUPWgfOlU5B9MlGxFO5T+cA==
+  version "2.2.27"
+  resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.27.tgz#a7c71fc7d401546ad94a026c30e868c078a70e87"
+  integrity sha512-gQPNF78qebCQ6tvVFBYrvJdBNOrYZm90ZlXgpIFm06p6qHDHq/XC4TnJftN6OMbxVE0UTBAoRgcsDeJBBooITw==
 
 object-inspect@^1.13.3, object-inspect@^1.13.4:
   version "1.13.4"
@@ -7178,11 +7202,11 @@ parse-link-header@2.0.0:
     xtend "~4.0.1"
 
 parse5@^7.1.2:
-  version "7.2.1"
-  resolved "https://registry.yarnpkg.com/parse5/-/parse5-7.2.1.tgz#8928f55915e6125f430cc44309765bf17556a33a"
-  integrity sha512-BuBYQYlv1ckiPdQi/ohiivi9Sagc9JG+Ozs0r7b/0iK3sKmrb0b9FdWdBbOdx6hBCM/F9Ir82ofnBhtZOjCRPQ==
+  version "7.3.0"
+  resolved "https://registry.yarnpkg.com/parse5/-/parse5-7.3.0.tgz#d7e224fa72399c7a175099f45fc2ad024b05ec05"
+  integrity sha512-IInvU7fabl34qmi9gY8XOVxhYyMyuH2xUNpb2q8/Y+7552KlejkRvqvD19nMoUW/uQGGbqNpA6Tufu5FL5BZgw==
   dependencies:
-    entities "^4.5.0"
+    entities "^6.0.0"
 
 parseurl@^1.3.3:
   version "1.3.3"
@@ -7277,11 +7301,16 @@ picocolors@^1.0.0, picocolors@^1.1.1:
   resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.1.1.tgz#3d321af3eab939b083c8f929a1d12cda81c26b6b"
   integrity sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==
 
-picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.3.1:
+picomatch@^2.0.4, picomatch@^2.3.1:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42"
   integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
 
+picomatch@^2.2.1:
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.2.tgz#5a942915e26b372dc0f0e6753149a16e6b1c5601"
+  integrity sha512-V7+vQEJ06Z+c5tSye8S+nHUfI51xoXIXjHQ99cQtKUkQqqO1kO/KCJUfZXuB47h/YBlDhah2H3hdUGXn8ie0oA==
+
 picomatch@^4.0.2, picomatch@^4.0.3:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-4.0.3.tgz#796c76136d1eead715db1e7bad785dedd695a042"
@@ -7310,9 +7339,9 @@ pirates@^4.0.6:
   integrity sha512-TfySrs/5nm8fQJDcBDuUng3VOUKsd7S+zqvbOTiGXHfxX4wK31ard+hoNuvkicM/2YFzlpDgABOevKSsB4G/FA==
 
 piscina@^4.3.1:
-  version "4.9.2"
-  resolved "https://registry.yarnpkg.com/piscina/-/piscina-4.9.2.tgz#80f2c2375231720337c703e443941adfac8caf75"
-  integrity sha512-Fq0FERJWFEUpB4eSY59wSNwXD4RYqR+nR/WiEVcZW8IWfVBxJJafcgTEZDQo8k3w0sUarJ8RyVbbUF4GQ2LGbQ==
+  version "4.9.4"
+  resolved "https://registry.yarnpkg.com/piscina/-/piscina-4.9.4.tgz#1fe911df1ffe920325c24822e5d7b596833a0df7"
+  integrity sha512-RyBDr2VheQ8ZfH3N8SzQZHztqVyOtadTwLnUYof6gdj5161/eu2wNhCbGl5GHnNKDpnkicJYpKtL2J+y/gk6XA==
   optionalDependencies:
     "@napi-rs/nice" "^1.0.1"
 
@@ -8181,6 +8210,14 @@ side-channel-list@^1.0.0:
     es-errors "^1.3.0"
     object-inspect "^1.13.3"
 
+side-channel-list@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/side-channel-list/-/side-channel-list-1.0.1.tgz#c2e0b5a14a540aebee3bbc6c3f8666cc9b509127"
+  integrity sha512-mjn/0bi/oUURjc5Xl7IaWi/OJJJumuoJFQJfDDyO46+hBWsfaVM65TBHq2eoZBhzl9EchxOijpkbRC8SVBQU0w==
+  dependencies:
+    es-errors "^1.3.0"
+    object-inspect "^1.13.4"
+
 side-channel-map@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/side-channel-map/-/side-channel-map-1.0.1.tgz#d6bb6b37902c6fef5174e5f533fab4c732a26f42"
@@ -8202,7 +8239,18 @@ side-channel-weakmap@^1.0.2:
     object-inspect "^1.13.3"
     side-channel-map "^1.0.1"
 
-side-channel@^1.0.4, side-channel@^1.1.0:
+side-channel@^1.0.4:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.1.1.tgz#ea02c62e05dc4bea67d4442f0fb71ee192f8e0ab"
+  integrity sha512-6x6dK6zJdpTzF4sQeNYxwtvBzf6Eg4GtlesS94HOvTudUeyK2WXAaIfmDgsyslYrRBeFIlsi54AYsFGUuhmvrQ==
+  dependencies:
+    es-errors "^1.3.0"
+    object-inspect "^1.13.4"
+    side-channel-list "^1.0.1"
+    side-channel-map "^1.0.1"
+    side-channel-weakmap "^1.0.2"
+
+side-channel@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.1.0.tgz#c3fcff9c4da932784873335ec9765fa94ff66bc9"
   integrity sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==
@@ -8720,9 +8768,9 @@ tldts@^7.0.5:
     tldts-core "^7.4.3"
 
 tmp@^0.2.3:
-  version "0.2.3"
-  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.2.3.tgz#eb783cc22bc1e8bebd0671476d46ea4eb32a79ae"
-  integrity sha512-nZD7m9iCPC5g0pYmcaxogYKggSfLsdxl8of3Q/oIbqCqLLIO9IAF0GWjX1z9NZRHPiXv8Wex4yDCaZsgEw0Y8w==
+  version "0.2.7"
+  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.2.7.tgz#26f4db11d1601ce8012dcb8a798ece1c06a99059"
+  integrity sha512-e0votIpp4Uo2AJYSzVHV6xCcawuiez3DzqDAbrTc3YxBkplN6e+dM13ZeIcZnDg/QpSuU2zfZ3rzwY8ukEnaXw==
 
 to-regex-range@^5.0.1:
   version "5.0.1"
@@ -8759,9 +8807,9 @@ tough-cookie@^6.0.1:
     tldts "^7.0.5"
 
 tr46@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/tr46/-/tr46-5.1.0.tgz#4a077922360ae807e172075ce5beb79b36e4a101"
-  integrity sha512-IUWnUK7ADYR5Sl1fZlO1INDUhVhatWl7BtJWsIhwJ0UAK7ilzzIa8uIqOO/aYVWHZPJkKbEL+362wrzoeRF7bw==
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/tr46/-/tr46-5.1.1.tgz#96ae867cddb8fdb64a49cc3059a8d428bcf238ca"
+  integrity sha512-hdF5ZgjTqgAntKkklYw0R03MG2x/bSzTtkxmIRw/sTNV8YXsCJ1tfLAX23lhxhHJlEf3CRCOCGGWw3vI3GaSPw==
   dependencies:
     punycode "^2.3.1"
 
@@ -9279,7 +9327,20 @@ which-module@^2.0.0:
   resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.1.tgz#776b1fe35d90aebe99e8ac15eb24093389a4a409"
   integrity sha512-iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ==
 
-which-typed-array@^1.1.13, which-typed-array@^1.1.16, which-typed-array@^1.1.18, which-typed-array@^1.1.19:
+which-typed-array@^1.1.13:
+  version "1.1.22"
+  resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.22.tgz#8f3cc78aefb40b437346dd40a1dbfa5d1da43fe9"
+  integrity sha512-fvO4ExWMFsqyhG3AiPAObMuY1lxaqgYcxbc49CNdWDDECOJNgQyvsOWVwbZc+qf3rzRtxojBK+CMEv0Ld5CYpw==
+  dependencies:
+    available-typed-arrays "^1.0.7"
+    call-bind "^1.0.9"
+    call-bound "^1.0.4"
+    for-each "^0.3.5"
+    get-proto "^1.0.1"
+    gopd "^1.2.0"
+    has-tostringtag "^1.0.2"
+
+which-typed-array@^1.1.16, which-typed-array@^1.1.18, which-typed-array@^1.1.19:
   version "1.1.19"
   resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.19.tgz#df03842e870b6b88e117524a4b364b6fc689f956"
   integrity sha512-rEvr90Bck4WZt9HHFC4DJMsjvu7x+r6bImz0/BrbWb7A2djJ8hnZMrWnHo9F8ssv0OMErasDhftrfROTyqSDrw==
@@ -9381,9 +9442,9 @@ write-file-atomic@^5.0.1:
     signal-exit "^4.0.1"
 
 ws@^8.18.0:
-  version "8.18.1"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-8.18.1.tgz#ea131d3784e1dfdff91adb0a4a116b127515e3cb"
-  integrity sha512-RKW2aJZMXeMxVpnZ6bck+RswznaxmzdULiBr6KY7XkTnW8uvt0iT9H5DkHUChXrc+uurzwa0rVI16n/Xzjdz1w==
+  version "8.21.3"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-8.21.3.tgz#660b4faddb6a3e575c86e078126919961f4de4fc"
+  integrity sha512-201TZ/kPWxoPr/OKWjquZR1SWKXcvxdH+e1xrx89b3YbmzLMFCLfnaG1HFIgWzJOEWZ7MvpK++odZufgYR50Rw==
 
 ws@^8.19.0, ws@^8.21.0:
   version "8.21.0"

From 47741a52e5ac8e3ce2e9f6a92e51fa895124e6e0 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Thu, 3 Sep 2026 13:42:44 +0300
Subject: [PATCH 07/18] drive-by

---
 src/stores/users.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/stores/users.js b/src/stores/users.js
index 54c3faa50..2eeb31b6e 100644
--- a/src/stores/users.js
+++ b/src/stores/users.js
@@ -706,7 +706,7 @@ export const useUsersStore = defineStore('users', {
           useOAuthStore().clearToken()
         }
 
-        if (error.tatusCode === 401) {
+        if (error.statusCode === 401) {
           throw new Error('Wrong username or password', error)
         } else {
           throw new Error('An error occurred, please try again', error)

From 9fe60eb860299dbc84c6f238a8fd25b9ef51dd92 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Thu, 3 Sep 2026 16:55:41 +0300
Subject: [PATCH 08/18] review

---
 src/components/emoji_input/suggestor.js     |  2 +-
 src/components/notification/notification.js |  4 +-
 src/components/side_drawer/side_drawer.js   |  2 +-
 src/components/side_drawer/side_drawer.vue  |  4 +-
 src/stores/drafts.js                        |  6 +--
 src/stores/follow_requests.js               |  7 +--
 src/stores/instance_capabilities.js         | 10 +++++
 src/stores/shout.js                         |  3 +-
 test/unit/specs/stores/users.spec.js        | 49 +++++++++++++--------
 9 files changed, 56 insertions(+), 31 deletions(-)

diff --git a/src/components/emoji_input/suggestor.js b/src/components/emoji_input/suggestor.js
index 72e376648..7d71f2978 100644
--- a/src/components/emoji_input/suggestor.js
+++ b/src/components/emoji_input/suggestor.js
@@ -15,7 +15,7 @@ import { useUsersStore } from 'src/stores/users.js'
 
 export default (data) => {
   const emojiCurry = suggestEmoji(data.emoji)
-  const usersCurry = data.store && suggestUsers(data.store)
+  const usersCurry = suggestUsers()
   return (input, nameKeywordLocalizer) => {
     const firstChar = input[0]
     if (firstChar === ':' && data.emoji) {
diff --git a/src/components/notification/notification.js b/src/components/notification/notification.js
index 51b60fb29..65acfed5c 100644
--- a/src/components/notification/notification.js
+++ b/src/components/notification/notification.js
@@ -165,7 +165,9 @@ const Notification = {
         id: this.user.id,
         credentials: useOAuthStore().token,
       }).then(() => {
-        useNotificationsStore().dismissNotificationLocal(this.notification.id)
+        useNotificationsStore().markSingleNotificationAsSeen(
+          this.notification.id,
+        )
         useFollowRequestsStore().remove(this.user.id)
       })
       this.hideDenyConfirmDialog()
diff --git a/src/components/side_drawer/side_drawer.js b/src/components/side_drawer/side_drawer.js
index 6b3fad7fa..02c6d63d0 100644
--- a/src/components/side_drawer/side_drawer.js
+++ b/src/components/side_drawer/side_drawer.js
@@ -110,7 +110,7 @@ const SideDrawer = {
       hideSitename: (store) => store.instanceIdentity.hideSitename,
     }),
     ...mapState(useChatsStore, ['unreadChatsCount']),
-    ...mapState(useDraftsStore, ['draftCount']),
+    ...mapState(useDraftsStore, ['draftsCount']),
   },
   methods: {
     toggleDrawer() {
diff --git a/src/components/side_drawer/side_drawer.vue b/src/components/side_drawer/side_drawer.vue
index f7b0563ba..8bd3b1336 100644
--- a/src/components/side_drawer/side_drawer.vue
+++ b/src/components/side_drawer/side_drawer.vue
@@ -269,10 +269,10 @@
               icon="file-pen"
             /> {{ $t('nav.drafts') }}
             <span
-              v-if="draftCount"
+              v-if="draftsCount"
               class="badge -neutral"
             >
-              {{ draftCount }}
+              {{ draftsCount }}
             </span>
           </router-link>
         </li>
diff --git a/src/stores/drafts.js b/src/stores/drafts.js
index bf707cbe4..0d2986e3c 100644
--- a/src/stores/drafts.js
+++ b/src/stores/drafts.js
@@ -57,7 +57,7 @@ export const useDraftsStore = defineStore('drafts', {
       await deleteDraftFromStorage([id])
     },
     async loadDrafts() {
-      const currentData = await getStorageData()
+      const currentData = (await getStorageData()) ?? {}
       this.drafts = new Map(Object.entries(currentData))
     },
     async addOrSaveDraft(draft) {
@@ -67,9 +67,9 @@ export const useDraftsStore = defineStore('drafts', {
       await saveDraftToStorage(draftWithId)
       return id
     },
-    async abandonAllDrafts(store) {
+    async abandonAllDrafts() {
       const ids = [...this.drafts.keys()]
-      ids.forEach((id) => this.abandonDraft(id))
+      ids.forEach((id) => this.drafts.delete(id))
       await deleteDraftFromStorage(ids)
     },
   },
diff --git a/src/stores/follow_requests.js b/src/stores/follow_requests.js
index 27f8cbc00..e30d7d4ca 100644
--- a/src/stores/follow_requests.js
+++ b/src/stores/follow_requests.js
@@ -15,7 +15,7 @@ export const useFollowRequestsStore = defineStore('followRequests', {
   },
   actions: {
     startFetching() {
-      if (this.fetcher) throw 'Fetcher already exists!'
+      if (this.fetcher) throw new Error('Fetcher already exists!')
 
       this.fetcher = followRequestFetcher({
         credentials: useOAuthStore().token,
@@ -24,8 +24,9 @@ export const useFollowRequestsStore = defineStore('followRequests', {
       this.fetcher.startFetching()
     },
     stopFetching() {
-      if (!this.fetcher) throw "Fetcher doesn't exists!"
-      this.fetcher.stopFetching(), (this.fetcher = null)
+      if (!this.fetcher) throw new Error("Fetcher doesn't exists!")
+      this.fetcher.stopFetching()
+      this.fetcher = null
     },
     setFollowRequests(requests) {
       this.requests = new Map(requests.map((user) => [user.id, user]))
diff --git a/src/stores/instance_capabilities.js b/src/stores/instance_capabilities.js
index a794ea21b..3e7ae3f0b 100644
--- a/src/stores/instance_capabilities.js
+++ b/src/stores/instance_capabilities.js
@@ -1,5 +1,8 @@
 import { defineStore } from 'pinia'
 
+import { useShoutStore } from 'src/stores/shout.js'
+import { useUsersStore } from 'src/stores/users.js'
+
 const defaultState = {
   postFormats: [],
   mailerEnabled: false,
@@ -38,6 +41,13 @@ export const useInstanceCapabilitiesStore = defineStore(
         }
 
         this[capability] = value
+
+        if (
+          capability === 'shoutAvailable' &&
+          useUsersStore().currentUser?.token
+        ) {
+          useShoutStore().initializeSocket()
+        }
       },
     },
   },
diff --git a/src/stores/shout.js b/src/stores/shout.js
index 487b04c4d..05cd340be 100644
--- a/src/stores/shout.js
+++ b/src/stores/shout.js
@@ -10,7 +10,6 @@ export const useShoutStore = defineStore('shout', {
     messages: [],
     channel: { state: '' },
     joined: false,
-    token: null,
     socket: null,
   }),
   getters: {
@@ -20,7 +19,7 @@ export const useShoutStore = defineStore('shout', {
     initializeSocket() {
       if (this.token === null) return
       if (!useInstanceCapabilitiesStore().shoutAvailable) return
-      if (this.socket !== null) throw new Error('Shout socket already exist!')
+      if (this.socket !== null) return
 
       this.socket = new Socket('/socket', { params: { token: this.token } })
       this.socket.connect()
diff --git a/test/unit/specs/stores/users.spec.js b/test/unit/specs/stores/users.spec.js
index 702f3b31b..6743ae8cc 100644
--- a/test/unit/specs/stores/users.spec.js
+++ b/test/unit/specs/stores/users.spec.js
@@ -5,7 +5,9 @@ import { setActivePinia } from 'pinia'
 import { useAnnouncementsStore } from 'src/stores/announcements.js'
 import { useBookmarkFoldersStore } from 'src/stores/bookmark_folders.js'
 import { useChatsStore } from 'src/stores/chats.js'
+import { useDraftsStore } from 'src/stores/drafts.js'
 import { useEmojiStore } from 'src/stores/emoji.js'
+import { useFollowRequestsStore } from 'src/stores/follow_requests.js'
 import { useInstanceCapabilitiesStore } from 'src/stores/instance_capabilities.js'
 import { useInterfaceStore } from 'src/stores/interface.js'
 import { useListsStore } from 'src/stores/lists.js'
@@ -53,12 +55,14 @@ const mockMastoAPIUser = ({
   name = userName,
   url = userUrl,
   id = userId,
+  locked = true,
 } = {}) => ({
   id,
   acct: screen_name,
   display_name: name,
   fields: [],
   avatar: '',
+  locked,
   url,
 })
 
@@ -67,17 +71,20 @@ const mockUser = ({
   id = userId,
   name = userName,
   url = userUrl,
+  locked = true,
 } = {}) => ({
   _original: mockMastoAPIUser({
     screen_name,
     id,
     name,
     url,
+    locked,
   }),
   id,
   name,
   screen_name,
   url,
+  locked,
   relationship: undefined,
 })
 
@@ -631,22 +638,24 @@ describe('Users store', () => {
 
         const spies = [
           // Misc initialization
-          vi.spyOn(useSyncConfigStore(), 'initSyncConfig'),
-          vi.spyOn(useUserHighlightStore(), 'initUserHighlight'),
-          vi.spyOn(useInterfaceStore(), 'applyTheme'),
-          vi.spyOn(useInterfaceStore(), 'onLogin'),
-          vi.spyOn(useEmojiStore(), 'fetchEmoji'),
+          /* 0 */ vi.spyOn(useSyncConfigStore(), 'initSyncConfig'),
+          /* 1 */ vi.spyOn(useUserHighlightStore(), 'initUserHighlight'),
+          /* 2 */ vi.spyOn(useInterfaceStore(), 'applyTheme'),
+          /* 3 */ vi.spyOn(useInterfaceStore(), 'onLogin'),
+          /* 4 */ vi.spyOn(useEmojiStore(), 'fetchEmoji'),
+          /* 5 */ vi.spyOn(useDraftsStore(), 'loadDrafts'),
 
           // Timeline / Notifications
-          vi.spyOn(useNotificationsStore(), 'activate'),
-          vi.spyOn(useTimelinesStore(), 'activatePersistents'),
+          /* 6 */ vi.spyOn(useNotificationsStore(), 'activate'),
+          /* 7 */ vi.spyOn(useTimelinesStore(), 'activatePersistents'),
 
           // Fetchers
-          vi.spyOn(useChatsStore(), 'startFetching'),
-          vi.spyOn(useListsStore(), 'startFetching'),
-          vi.spyOn(useAnnouncementsStore(), 'startFetching'),
-          vi.spyOn(useBookmarkFoldersStore(), 'startFetching'),
-          vi.spyOn(useStreamingStore(), 'initSocket'),
+          /* 8 */ vi.spyOn(useChatsStore(), 'startFetching'),
+          /* 9 */ vi.spyOn(useListsStore(), 'startFetching'),
+          /* 10 */ vi.spyOn(useAnnouncementsStore(), 'startFetching'),
+          /* 11 */ vi.spyOn(useBookmarkFoldersStore(), 'startFetching'),
+          /* 12 */ vi.spyOn(useFollowRequestsStore(), 'startFetching'),
+          /* 13 */ vi.spyOn(useStreamingStore(), 'initSocket'),
         ]
 
         spies.forEach((spy) => {
@@ -758,6 +767,7 @@ describe('Users store', () => {
           /* 11 */ vi.spyOn(useAnnouncementsStore(), 'stopFetching'),
           /* 12 */ vi.spyOn(useBookmarkFoldersStore(), 'stopFetching'),
           /* 13 */ vi.spyOn(useStreamingStore(), 'stopSocket'),
+          /* 14 */ vi.spyOn(useFollowRequestsStore(), 'stopFetching'),
         ]
 
         spies.forEach((spy) => {
@@ -771,6 +781,7 @@ describe('Users store', () => {
 
         const store = useUsersStore()
         store.currentUser = mockUser()
+        store.currentUser.locked = true
 
         // Adding some users to verify they are getting cleaned afterwards
         store.addNewUsers({
@@ -832,17 +843,19 @@ describe('Users store', () => {
           /* 3 */ vi.spyOn(useChatsStore(), 'stopFetching'),
           /* 4 */ vi.spyOn(useAnnouncementsStore(), 'stopFetching'),
           /* 5 */ vi.spyOn(useBookmarkFoldersStore(), 'stopFetching'),
+          /* 6 */ vi.spyOn(useFollowRequestsStore(), 'stopFetching'),
 
           // ## RESUME ##
           // Timeline / Notifications
-          /* 6 */ vi.spyOn(useNotificationsStore(), 'resume'),
-          /* 7 */ vi.spyOn(useTimelinesStore(), 'resumeAll'),
+          /* 7 */ vi.spyOn(useNotificationsStore(), 'resume'),
+          /* 8 */ vi.spyOn(useTimelinesStore(), 'resumeAll'),
 
           // Fetchers (Pauseless)
-          /* 8 */ vi.spyOn(useListsStore(), 'startFetching'),
-          /* 9 */ vi.spyOn(useChatsStore(), 'startFetching'),
-          /* 10 */ vi.spyOn(useAnnouncementsStore(), 'startFetching'),
-          /* 11 */ vi.spyOn(useBookmarkFoldersStore(), 'startFetching'),
+          /* 9 */ vi.spyOn(useListsStore(), 'startFetching'),
+          /* 10 */ vi.spyOn(useChatsStore(), 'startFetching'),
+          /* 11 */ vi.spyOn(useAnnouncementsStore(), 'startFetching'),
+          /* 12 */ vi.spyOn(useBookmarkFoldersStore(), 'startFetching'),
+          /* 13 */ vi.spyOn(useFollowRequestsStore(), 'startFetching'),
         ]
 
         spies.forEach((spy) => {

From e3bc6dbb653cc2ca172921886b33dc7c9868a7f2 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Thu, 3 Sep 2026 19:05:20 +0300
Subject: [PATCH 09/18] drafts unit test

---
 src/stores/drafts.js                  |   8 +-
 test/unit/specs/stores/drafts.spec.js | 196 ++++++++++++++++++++++++++
 2 files changed, 200 insertions(+), 4 deletions(-)
 create mode 100644 test/unit/specs/stores/drafts.spec.js

diff --git a/src/stores/drafts.js b/src/stores/drafts.js
index 0d2986e3c..1a57a71af 100644
--- a/src/stores/drafts.js
+++ b/src/stores/drafts.js
@@ -52,10 +52,6 @@ export const useDraftsStore = defineStore('drafts', {
     },
   },
   actions: {
-    async abandonDraft(id) {
-      this.drafts.delete(id)
-      await deleteDraftFromStorage([id])
-    },
     async loadDrafts() {
       const currentData = (await getStorageData()) ?? {}
       this.drafts = new Map(Object.entries(currentData))
@@ -67,6 +63,10 @@ export const useDraftsStore = defineStore('drafts', {
       await saveDraftToStorage(draftWithId)
       return id
     },
+    async abandonDraft(id) {
+      this.drafts.delete(id)
+      await deleteDraftFromStorage([id])
+    },
     async abandonAllDrafts() {
       const ids = [...this.drafts.keys()]
       ids.forEach((id) => this.drafts.delete(id))
diff --git a/test/unit/specs/stores/drafts.spec.js b/test/unit/specs/stores/drafts.spec.js
new file mode 100644
index 000000000..e9b7b9614
--- /dev/null
+++ b/test/unit/specs/stores/drafts.spec.js
@@ -0,0 +1,196 @@
+import { createTestingPinia } from '@pinia/testing'
+import { setActivePinia } from 'pinia'
+
+import { useDraftsStore } from 'src/stores/drafts.js'
+
+import { storage } from 'src/lib/storage.js'
+
+describe('Drafts store', () => {
+  beforeEach(() => {
+    setActivePinia(createTestingPinia({ stubActions: false }))
+
+    // Localforage does something weird that resets get/setItem and breaks
+    // mocking if we just spy one them without overriding implementation
+    vi.spyOn(storage, 'setItem').mockImplementation(() => ({}))
+    vi.spyOn(storage, 'getItem').mockImplementation(() => ({}))
+  })
+
+  afterEach(() => {
+    vi.resetAllMocks()
+  })
+
+  describe('Getters', () => {
+    it('draftsCount returns total number of drafts', async () => {
+      const store = useDraftsStore()
+
+      await store.addOrSaveDraft({ id: 1, status: 'draft' })
+      await store.addOrSaveDraft({ id: 2, status: 'draft' })
+      await store.addOrSaveDraft({ id: 3, status: 'draft' })
+
+      expect(store).to.have.property('draftsCount', 3)
+    })
+
+    it('draftsArray returns array of drafts', async () => {
+      const store = useDraftsStore()
+
+      await store.addOrSaveDraft({ id: 1, status: 'draft' })
+      await store.addOrSaveDraft({ id: 2, status: 'draft' })
+      await store.addOrSaveDraft({ id: 3, status: 'draft' })
+
+      expect(store.draftsArray).to.have.length(3)
+      expect(store.draftsArray).to.be.an('Array')
+      expect(store.draftsArray).to.have.deep.members([
+        { id: 1, status: 'draft' },
+        { id: 2, status: 'draft' },
+        { id: 3, status: 'draft' },
+      ])
+    })
+
+    it('draftsByTypeAndRefId', async () => {
+      const store = useDraftsStore()
+
+      await store.addOrSaveDraft({ id: 1, type: 'edit', refId: 'e1', status: 'draft' })
+      await store.addOrSaveDraft({ id: 2, type: 'reply', refId: 'r1', status: 'draft' })
+      await store.addOrSaveDraft({ id: 3, status: 'draft' })
+      await store.addOrSaveDraft({ id: 4, type: 'edit', refId: 'e2', status: 'draft' })
+      await store.addOrSaveDraft({ id: 5, type: 'reply', refId: 'r2', status: 'draft' })
+
+      expect(store.draftsByTypeAndRefId).to.be.a('function')
+      expect(store.draftsByTypeAndRefId('edit', 'e1')).to.eql([{ id: 1, type: 'edit', refId: 'e1', status: 'draft' }])
+      expect(store.draftsByTypeAndRefId('reply', 'r1')).to.eql([{ id: 2, type: 'reply', refId: 'r1', status: 'draft' }])
+    })
+  })
+
+  describe('Actions', () => {
+    describe('loadDrafts', () => {
+      it('should load drafts from storage and populate cache', async () => {
+        const store = useDraftsStore()
+        storage.getItem.mockResolvedValueOnce({
+          a: { id: 'a', status: 'draft' },
+          b: { id: 'b', status: 'draft' },
+          c: { id: 'c', status: 'draft' },
+        })
+
+        await store.loadDrafts()
+
+        expect(store.drafts.get('a')).to.have.property('status', 'draft')
+        expect(store.drafts.get('b')).to.have.property('status', 'draft')
+        expect(store.drafts.get('c')).to.have.property('status', 'draft')
+
+        expect(storage.getItem).to.have.been.calledOnce
+        expect(storage.getItem).to.have.been.calledWith('pleroma-fe-drafts')
+        expect(storage.setItem).to.have.not.been.called
+      })
+
+      it('should handle case where there is no local draft storage yet', async () => {
+        const store = useDraftsStore()
+        storage.getItem.mockResolvedValueOnce(null)
+
+        await store.loadDrafts()
+
+        expect(store.drafts).to.have.property('size', 0)
+
+        expect(storage.getItem).to.have.been.calledOnce
+        expect(storage.getItem).to.have.been.calledWith('pleroma-fe-drafts')
+        expect(storage.setItem).to.have.not.been.called
+      })
+    })
+
+    describe('addOrSaveDraft', () => {
+      it('create draft', async () => {
+        const store = useDraftsStore()
+        vi.setSystemTime(new Date(1997, 2, 29))
+
+        const id = await store.addOrSaveDraft({ status: 'draft' })
+
+        expect(store.drafts).to.have.property('size', 1)
+        expect(id).to.eql('859586400000')
+        expect(store.drafts.get(id)).to.have.property('status', 'draft')
+        expect(storage.getItem).to.have.been.calledOnce
+        expect(storage.setItem).to.have.been.calledOnce
+        expect(storage.setItem).to.have.been.calledWith('pleroma-fe-drafts', {
+          [id]: {
+            id,
+            status: 'draft',
+          }
+        })
+      })
+
+      it('update draft', async () => {
+        const store = useDraftsStore()
+        await store.addOrSaveDraft({ id: '1', status: 'draft' })
+
+        expect(store.drafts.get('1')).to.have.property('status', 'draft')
+
+        await store.addOrSaveDraft({ id: '1', status: 'updated' })
+
+        expect(store.drafts.get('1')).to.have.property('status', 'updated')
+        expect(storage.getItem).to.have.been.calledTwice
+        expect(storage.setItem).to.have.been.calledTwice
+        expect(storage.setItem).to.have.been.calledWith('pleroma-fe-drafts', {
+          '1': {
+            id: '1',
+            status: 'draft',
+          }
+        })
+      })
+    })
+
+    describe('abandonDraft', () => {
+      it('should remove draft from storage and cache', async () => {
+        const store = useDraftsStore()
+        store.drafts.set('a', { id: 'a', status: 'draft' })
+        store.drafts.set('b', { id: 'b', status: 'draft' })
+        store.drafts.set('c', { id: 'c', status: 'draft' })
+        storage.getItem.mockResolvedValueOnce({
+          a: { id: 'a', status: 'draft' },
+          b: { id: 'b', status: 'draft' },
+          c: { id: 'c', status: 'draft' },
+        })
+
+        await store.abandonDraft('b')
+
+        expect(store.drafts.get('a')).to.have.property('status', 'draft')
+        expect(store.drafts.get('b')).to.be.undefined
+        expect(store.drafts.get('c')).to.have.property('status', 'draft')
+
+        expect(storage.getItem).to.have.been.calledOnce
+        expect(storage.setItem).to.have.been.calledOnce
+        expect(storage.setItem).to.have.been.calledWith('pleroma-fe-drafts', {
+          'a': {
+            id: 'a',
+            status: 'draft',
+          },
+          'c': {
+            id: 'c',
+            status: 'draft',
+          }
+        })
+      })
+    })
+
+    describe('abandonAllDrafts', () => {
+      it('should remove draft from storage and cache', async () => {
+        const store = useDraftsStore()
+        store.drafts.set('a', { id: 'a', status: 'draft' })
+        store.drafts.set('b', { id: 'b', status: 'draft' })
+        store.drafts.set('c', { id: 'c', status: 'draft' })
+        storage.getItem.mockResolvedValueOnce({
+          a: { id: 'a', status: 'draft' },
+          b: { id: 'b', status: 'draft' },
+          c: { id: 'c', status: 'draft' },
+        })
+
+        await store.abandonAllDrafts()
+
+        expect(store.drafts.get('a')).to.be.undefined
+        expect(store.drafts.get('b')).to.be.undefined
+        expect(store.drafts.get('c')).to.be.undefined
+
+        expect(storage.getItem).to.have.been.calledOnce
+        expect(storage.setItem).to.have.been.calledOnce
+        expect(storage.setItem).to.have.been.calledWith('pleroma-fe-drafts', {})
+      })
+    })
+  })
+})

From 10e3cb588ae1938d86a4a4b3bfbc78fa61979d02 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Thu, 3 Sep 2026 21:21:08 +0300
Subject: [PATCH 10/18] follow requests refactor

---
 src/App.js                                    |   6 +
 src/App.vue                                   |   1 +
 src/api/user.js                               |   5 +-
 .../follow_request_card.js                    |  84 +----
 .../follow_request_card.vue                   |  26 +-
 .../follow_request_confirm.vue                |  38 ++
 src/components/notification/notification.js   |  65 +---
 src/components/notification/notification.vue  |  26 +-
 src/stores/fetchers/follow_requests.js        |   2 -
 src/stores/follow_requests.js                 |  78 +++-
 test/unit/specs/stores/drafts.spec.js         |  48 ++-
 .../unit/specs/stores/follow_requests.spec.js | 338 ++++++++++++++++++
 12 files changed, 507 insertions(+), 210 deletions(-)
 create mode 100644 src/components/follow_request_confirm/follow_request_confirm.vue
 create mode 100644 test/unit/specs/stores/follow_requests.spec.js

diff --git a/src/App.js b/src/App.js
index 66ae09a9d..ae38204b6 100644
--- a/src/App.js
+++ b/src/App.js
@@ -49,6 +49,12 @@ export default {
     MobilePostStatusButton,
     MobileNav,
     DesktopNav,
+    FollowRequestConfirm: defineAsyncComponent(
+      () =>
+        import(
+          'src/components/follow_request_confirm/follow_request_confirm.vue'
+        ),
+    ),
     SettingsModal: defineAsyncComponent(
       () => import('src/components/settings_modal/settings_modal.vue'),
     ),
diff --git a/src/App.vue b/src/App.vue
index bd19c5c10..cad329a78 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -75,6 +75,7 @@
     <UpdateNotification />
     <GlobalError />
     <GlobalNoticeList />
+    <FollowRequestConfirm v-if="currentUser" />
   </div>
 </template>
 
diff --git a/src/api/user.js b/src/api/user.js
index 8849847d6..2f356ebbc 100644
--- a/src/api/user.js
+++ b/src/api/user.js
@@ -43,9 +43,10 @@ export const MASTODON_FOLLOW_URL = (id) => `/api/v1/accounts/${id}/follow`
 export const MASTODON_UNFOLLOW_URL = (id) => `/api/v1/accounts/${id}/unfollow`
 
 const MASTODON_FOLLOW_REQUESTS_URL = '/api/v1/follow_requests'
-const MASTODON_APPROVE_USER_URL = (id) =>
+export const MASTODON_APPROVE_USER_URL = (id) =>
   `/api/v1/follow_requests/${id}/authorize`
-const MASTODON_DENY_USER_URL = (id) => `/api/v1/follow_requests/${id}/reject`
+export const MASTODON_DENY_USER_URL = (id) =>
+  `/api/v1/follow_requests/${id}/reject`
 const MASTODON_USER_RELATIONSHIPS_URL = ({ id, withSuspended }) =>
   `/api/v1/accounts/relationships/${paramsString({ id, withSuspended })}`
 export const MASTODON_USER_IN_LISTS = (id) => `/api/v1/accounts/${id}/lists`
diff --git a/src/components/follow_request_card/follow_request_card.js b/src/components/follow_request_card/follow_request_card.js
index a8492b887..d790e68a5 100644
--- a/src/components/follow_request_card/follow_request_card.js
+++ b/src/components/follow_request_card/follow_request_card.js
@@ -1,96 +1,16 @@
-import { defineAsyncComponent } from 'vue'
+import { mapActions } from 'pinia'
 
 import BasicUserCard from '../basic_user_card/basic_user_card.vue'
 
 import { useFollowRequestsStore } from 'src/stores/follow_requests.js'
-import { useMergedConfigStore } from 'src/stores/merged_config.js'
-import { useNotificationsStore } from 'src/stores/notifications.js'
-import { useOAuthStore } from 'src/stores/oauth.js'
-
-import { approveUser, denyUser } from 'src/api/user.js'
 
 const FollowRequestCard = {
   props: ['user'],
   components: {
     BasicUserCard,
-    ConfirmModal: defineAsyncComponent(
-      () => import('src/components/confirm_modal/confirm_modal.vue'),
-    ),
-  },
-  data() {
-    return {
-      showingApproveConfirmDialog: false,
-      showingDenyConfirmDialog: false,
-    }
   },
   methods: {
-    findFollowRequestNotificationId() {
-      const notif = useNotificationsStore().data.find(
-        (notif) =>
-          notif.from_profile.id === this.user.id &&
-          notif.type === 'follow_request',
-      )
-      return notif?.id
-    },
-    showApproveConfirmDialog() {
-      this.showingApproveConfirmDialog = true
-    },
-    hideApproveConfirmDialog() {
-      this.showingApproveConfirmDialog = false
-    },
-    showDenyConfirmDialog() {
-      this.showingDenyConfirmDialog = true
-    },
-    hideDenyConfirmDialog() {
-      this.showingDenyConfirmDialog = false
-    },
-    approveUser() {
-      if (this.shouldConfirmApprove) {
-        this.showApproveConfirmDialog()
-      } else {
-        this.doApprove()
-      }
-    },
-    doApprove() {
-      approveUser({
-        id: this.user.id,
-        credentials: useOAuthStore().token,
-      }).then(() => {
-        const notifId = this.findFollowRequestNotificationId()
-        useFollowRequestsStore().remove(this.user.id)
-        notifId && useNotificationsStore().markSingleNotificationAsSeen(notifId)
-      })
-      this.hideApproveConfirmDialog()
-    },
-    denyUser() {
-      if (this.shouldConfirmDeny) {
-        this.showDenyConfirmDialog()
-      } else {
-        this.doDeny()
-      }
-    },
-    doDeny() {
-      denyUser({
-        id: this.user.id,
-        credentials: useOAuthStore().token,
-      }).then(() => {
-        const notifId = this.findFollowRequestNotificationId()
-        useFollowRequestsStore().remove(this.user.id)
-        notifId && useNotificationsStore().markSingleNotificationAsSeen(notifId)
-      })
-      this.hideDenyConfirmDialog()
-    },
-  },
-  computed: {
-    mergedConfig() {
-      return useMergedConfigStore().mergedConfig
-    },
-    shouldConfirmApprove() {
-      return this.mergedConfig.modalOnApproveFollow
-    },
-    shouldConfirmDeny() {
-      return this.mergedConfig.modalOnDenyFollow
-    },
+    ...mapActions(useFollowRequestsStore, ['approve', 'deny']),
   },
 }
 
diff --git a/src/components/follow_request_card/follow_request_card.vue b/src/components/follow_request_card/follow_request_card.vue
index 64b185094..4d771b454 100644
--- a/src/components/follow_request_card/follow_request_card.vue
+++ b/src/components/follow_request_card/follow_request_card.vue
@@ -3,39 +3,17 @@
     <div class="follow-request-card-content-container">
       <button
         class="btn button-default"
-        @click="approveUser"
+        @click="() => approve(user.id)"
       >
         {{ $t('user_card.approve') }}
       </button>
       <button
         class="btn button-default"
-        @click="denyUser"
+        @click="() => deny(user.id)"
       >
         {{ $t('user_card.deny') }}
       </button>
     </div>
-    <teleport to="#modal">
-      <ConfirmModal
-        v-if="showingApproveConfirmDialog"
-        :title="$t('user_card.approve_confirm_title')"
-        :confirm-text="$t('user_card.approve_confirm_accept_button')"
-        :cancel-text="$t('user_card.approve_confirm_cancel_button')"
-        @accepted="doApprove"
-        @cancelled="hideApproveConfirmDialog"
-      >
-        {{ $t('user_card.approve_confirm', { user: user.screen_name_ui }) }}
-      </ConfirmModal>
-      <ConfirmModal
-        v-if="showingDenyConfirmDialog"
-        :title="$t('user_card.deny_confirm_title')"
-        :confirm-text="$t('user_card.deny_confirm_accept_button')"
-        :cancel-text="$t('user_card.deny_confirm_cancel_button')"
-        @accepted="doDeny"
-        @cancelled="hideDenyConfirmDialog"
-      >
-        {{ $t('user_card.deny_confirm', { user: user.screen_name_ui }) }}
-      </ConfirmModal>
-    </teleport>
   </basic-user-card>
 </template>
 
diff --git a/src/components/follow_request_confirm/follow_request_confirm.vue b/src/components/follow_request_confirm/follow_request_confirm.vue
new file mode 100644
index 000000000..2a873f3f5
--- /dev/null
+++ b/src/components/follow_request_confirm/follow_request_confirm.vue
@@ -0,0 +1,38 @@
+<template>
+  <teleport to="#modal">
+    <div>
+      <ConfirmModal
+        v-if="store.showingApproveConfirmDialog"
+        :title="$t('user_card.approve_confirm_title')"
+        :confirm-text="$t('user_card.approve_confirm_accept_button')"
+        :cancel-text="$t('user_card.approve_confirm_cancel_button')"
+        @accepted="store.doApprove"
+        @cancelled="store.hideApproveConfirmDialog"
+      >
+        {{ $t('user_card.approve_confirm', { user: user.screen_name_ui }) }}
+      </ConfirmModal>
+      <ConfirmModal
+        v-if="store.showingDenyConfirmDialog"
+        :title="$t('user_card.deny_confirm_title')"
+        :confirm-text="$t('user_card.deny_confirm_accept_button')"
+        :cancel-text="$t('user_card.deny_confirm_cancel_button')"
+        @accepted="store.doDeny"
+        @cancelled="store.hideDenyConfirmDialog"
+      >
+        {{ $t('user_card.deny_confirm', { user: user.screen_name_ui }) }}
+      </ConfirmModal>
+    </div>
+  </teleport>
+</template>
+
+<script setup>
+import { computed } from 'vue'
+
+import ConfirmModal from 'src/components/confirm_modal/confirm_modal.vue'
+
+import { useFollowRequestsStore } from 'src/stores/follow_requests.js'
+import { useUsersStore } from 'src/stores/users.js'
+
+const store = useFollowRequestsStore()
+const user = computed(() => useUsersStore().findUser(store.tempId))
+</script>
diff --git a/src/components/notification/notification.js b/src/components/notification/notification.js
index 65acfed5c..cff7f655f 100644
--- a/src/components/notification/notification.js
+++ b/src/components/notification/notification.js
@@ -1,5 +1,4 @@
-import { mapState } from 'pinia'
-import { defineAsyncComponent } from 'vue'
+import { mapActions, mapState } from 'pinia'
 
 import Report from 'src/components/report/report.vue'
 import StatusContent from 'src/components/status_content/status_content.vue'
@@ -16,13 +15,10 @@ import {
 import { useFollowRequestsStore } from 'src/stores/follow_requests.js'
 import { useInstanceStore } from 'src/stores/instance.js'
 import { useMergedConfigStore } from 'src/stores/merged_config.js'
-import { useNotificationsStore } from 'src/stores/notifications.js'
-import { useOAuthStore } from 'src/stores/oauth.js'
 import { useStatusesStore } from 'src/stores/statuses.js'
 import { useUserHighlightStore } from 'src/stores/user_highlight.js'
 import { useUsersStore } from 'src/stores/users.js'
 
-import { approveUser, denyUser } from 'src/api/user.js'
 import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator'
 
 import { library } from '@fortawesome/fontawesome-svg-core'
@@ -58,8 +54,6 @@ const Notification = {
       selecting: false,
       statusExpanded: false,
       unmuted: false,
-      showingApproveConfirmDialog: false,
-      showingDenyConfirmDialog: false,
     }
   },
   props: ['notification'],
@@ -73,9 +67,6 @@ const Notification = {
 
     UserPopover,
     UserLink,
-    ConfirmModal: defineAsyncComponent(
-      () => import('src/components/confirm_modal/confirm_modal.vue'),
-    ),
   },
   mounted() {
     document.addEventListener('selectionchange', this.onContentSelect)
@@ -125,53 +116,7 @@ const Notification = {
     toggleMute() {
       this.unmuted = !this.unmuted
     },
-    showApproveConfirmDialog() {
-      this.showingApproveConfirmDialog = true
-    },
-    hideApproveConfirmDialog() {
-      this.showingApproveConfirmDialog = false
-    },
-    showDenyConfirmDialog() {
-      this.showingDenyConfirmDialog = true
-    },
-    hideDenyConfirmDialog() {
-      this.showingDenyConfirmDialog = false
-    },
-    approveUser() {
-      if (this.shouldConfirmApprove) {
-        this.showApproveConfirmDialog()
-      } else {
-        this.doApprove()
-      }
-    },
-    doApprove() {
-      approveUser({
-        id: this.user.id,
-        credentials: useOAuthStore().token,
-      })
-      useFollowRequestsStore().remove(this.user.id)
-      useNotificationsStore().markSingleNotificationAsSeen(this.notification.id)
-      this.hideApproveConfirmDialog()
-    },
-    denyUser() {
-      if (this.shouldConfirmDeny) {
-        this.showDenyConfirmDialog()
-      } else {
-        this.doDeny()
-      }
-    },
-    doDeny() {
-      denyUser({
-        id: this.user.id,
-        credentials: useOAuthStore().token,
-      }).then(() => {
-        useNotificationsStore().markSingleNotificationAsSeen(
-          this.notification.id,
-        )
-        useFollowRequestsStore().remove(this.user.id)
-      })
-      this.hideDenyConfirmDialog()
-    },
+    ...mapActions(useFollowRequestsStore, ['approve', 'deny']),
   },
   computed: {
     status() {
@@ -222,12 +167,6 @@ const Notification = {
     scaleMfm() {
       return this.mergedConfig.scaleMfm
     },
-    shouldConfirmApprove() {
-      return this.mergedConfig.modalOnApproveFollow
-    },
-    shouldConfirmDeny() {
-      return this.mergedConfig.modalOnDenyFollow
-    },
     ...mapState(useUsersStore, ['currentUser']),
   },
 }
diff --git a/src/components/notification/notification.vue b/src/components/notification/notification.vue
index 601e574db..156c9ac11 100644
--- a/src/components/notification/notification.vue
+++ b/src/components/notification/notification.vue
@@ -226,7 +226,7 @@
             <button
               class="button-unstyled"
               :title="$t('tool_tip.accept_follow_request')"
-              @click="approveUser()"
+              @click="() => approve(user.id)"
             >
               <FAIcon
                 icon="check"
@@ -236,7 +236,7 @@
             <button
               class="button-unstyled"
               :title="$t('tool_tip.reject_follow_request')"
-              @click="denyUser()"
+              @click="() => deny(user.id)"
             >
               <FAIcon
                 icon="times"
@@ -268,28 +268,6 @@
         </template>
       </div>
     </div>
-    <teleport to="#modal">
-      <ConfirmModal
-        v-if="showingApproveConfirmDialog"
-        :title="$t('user_card.approve_confirm_title')"
-        :confirm-text="$t('user_card.approve_confirm_accept_button')"
-        :cancel-text="$t('user_card.approve_confirm_cancel_button')"
-        @accepted="doApprove"
-        @cancelled="hideApproveConfirmDialog"
-      >
-        {{ $t('user_card.approve_confirm', { user: user.screen_name_ui }) }}
-      </ConfirmModal>
-      <ConfirmModal
-        v-if="showingDenyConfirmDialog"
-        :title="$t('user_card.deny_confirm_title')"
-        :confirm-text="$t('user_card.deny_confirm_accept_button')"
-        :cancel-text="$t('user_card.deny_confirm_cancel_button')"
-        @accepted="doDeny"
-        @cancelled="hideDenyConfirmDialog"
-      >
-        {{ $t('user_card.deny_confirm', { user: user.screen_name_ui }) }}
-      </ConfirmModal>
-    </teleport>
   </article>
 </template>
 
diff --git a/src/stores/fetchers/follow_requests.js b/src/stores/fetchers/follow_requests.js
index 8794ab07e..c48b289ef 100644
--- a/src/stores/fetchers/follow_requests.js
+++ b/src/stores/fetchers/follow_requests.js
@@ -24,8 +24,6 @@ const followRequestFetcher = ({ credentials }) => {
   const startFetching = () => {
     if (interval.value) throw new Error('Interval already exists!')
 
-    fetchAndUpdate()
-
     interval.value = promiseInterval(fetchAndUpdate, 10000)
   }
 
diff --git a/src/stores/follow_requests.js b/src/stores/follow_requests.js
index e30d7d4ca..647821782 100644
--- a/src/stores/follow_requests.js
+++ b/src/stores/follow_requests.js
@@ -1,12 +1,19 @@
 import { defineStore } from 'pinia'
 
 import followRequestFetcher from 'src/stores/fetchers/follow_requests.js'
+import { useMergedConfigStore } from 'src/stores/merged_config.js'
+import { useNotificationsStore } from 'src/stores/notifications.js'
 import { useOAuthStore } from 'src/stores/oauth.js'
 
+import { approveUser, denyUser } from 'src/api/user.js'
+
 export const useFollowRequestsStore = defineStore('followRequests', {
   state: () => ({
     fetcher: null,
     requests: new Map(),
+    showingApproveConfirmDialog: false,
+    showingDenyConfirmDialog: false,
+    tempId: null,
   }),
   getters: {
     followRequestsCount(state) {
@@ -14,6 +21,7 @@ export const useFollowRequestsStore = defineStore('followRequests', {
     },
   },
   actions: {
+    // Fetcher stuff
     startFetching() {
       if (this.fetcher) throw new Error('Fetcher already exists!')
 
@@ -31,8 +39,76 @@ export const useFollowRequestsStore = defineStore('followRequests', {
     setFollowRequests(requests) {
       this.requests = new Map(requests.map((user) => [user.id, user]))
     },
-    remove(id) {
+
+    // Confirm dialogs
+    showApproveConfirmDialog(id) {
+      this.showingApproveConfirmDialog = true
+      this.tempId = id
+    },
+    showDenyConfirmDialog(id) {
+      this.showingDenyConfirmDialog = true
+      this.tempId = id
+    },
+    hideApproveConfirmDialog() {
+      this.showingApproveConfirmDialog = false
+      this.tempId = null
+    },
+    hideDenyConfirmDialog() {
+      this.showingDenyConfirmDialog = false
+      this.tempId = null
+    },
+
+    // Dialog/Instant fork
+    approve(id) {
+      if (useMergedConfigStore().mergedConfig.modalOnApproveFollow) {
+        this.showApproveConfirmDialog(id)
+      } else {
+        this.doApprove(id)
+      }
+    },
+    deny(id) {
+      if (useMergedConfigStore().mergedConfig.modalOnDenyFollow) {
+        this.showDenyConfirmDialog(id)
+      } else {
+        this.doDeny(id)
+      }
+    },
+
+    // Actual calls
+    async doApprove(userId) {
+      const id = userId ?? this.tempId
+      this.hideApproveConfirmDialog()
+
+      await approveUser({
+        id,
+        credentials: useOAuthStore().token,
+      })
+
+      const notifId = this.findFollowRequestNotificationId(id)
+      notifId && useNotificationsStore().markSingleNotificationAsSeen(notifId)
       this.requests.delete(id)
     },
+    async doDeny(userId) {
+      const id = userId ?? this.tempId
+      this.hideDenyConfirmDialog()
+
+      await denyUser({
+        id,
+        credentials: useOAuthStore().token,
+      })
+
+      const notifId = this.findFollowRequestNotificationId(id)
+      notifId && useNotificationsStore().markSingleNotificationAsSeen(notifId)
+      this.requests.delete(id)
+    },
+
+    // Utility
+    findFollowRequestNotificationId(userId) {
+      const notif = useNotificationsStore().data.find(
+        (notif) =>
+          notif.from_profile.id === userId && notif.type === 'follow_request',
+      )
+      return notif?.id
+    },
   },
 })
diff --git a/test/unit/specs/stores/drafts.spec.js b/test/unit/specs/stores/drafts.spec.js
index e9b7b9614..9beb4587f 100644
--- a/test/unit/specs/stores/drafts.spec.js
+++ b/test/unit/specs/stores/drafts.spec.js
@@ -49,15 +49,39 @@ describe('Drafts store', () => {
     it('draftsByTypeAndRefId', async () => {
       const store = useDraftsStore()
 
-      await store.addOrSaveDraft({ id: 1, type: 'edit', refId: 'e1', status: 'draft' })
-      await store.addOrSaveDraft({ id: 2, type: 'reply', refId: 'r1', status: 'draft' })
+      await store.addOrSaveDraft({
+        id: 1,
+        type: 'edit',
+        refId: 'e1',
+        status: 'draft',
+      })
+      await store.addOrSaveDraft({
+        id: 2,
+        type: 'reply',
+        refId: 'r1',
+        status: 'draft',
+      })
       await store.addOrSaveDraft({ id: 3, status: 'draft' })
-      await store.addOrSaveDraft({ id: 4, type: 'edit', refId: 'e2', status: 'draft' })
-      await store.addOrSaveDraft({ id: 5, type: 'reply', refId: 'r2', status: 'draft' })
+      await store.addOrSaveDraft({
+        id: 4,
+        type: 'edit',
+        refId: 'e2',
+        status: 'draft',
+      })
+      await store.addOrSaveDraft({
+        id: 5,
+        type: 'reply',
+        refId: 'r2',
+        status: 'draft',
+      })
 
       expect(store.draftsByTypeAndRefId).to.be.a('function')
-      expect(store.draftsByTypeAndRefId('edit', 'e1')).to.eql([{ id: 1, type: 'edit', refId: 'e1', status: 'draft' }])
-      expect(store.draftsByTypeAndRefId('reply', 'r1')).to.eql([{ id: 2, type: 'reply', refId: 'r1', status: 'draft' }])
+      expect(store.draftsByTypeAndRefId('edit', 'e1')).to.eql([
+        { id: 1, type: 'edit', refId: 'e1', status: 'draft' },
+      ])
+      expect(store.draftsByTypeAndRefId('reply', 'r1')).to.eql([
+        { id: 2, type: 'reply', refId: 'r1', status: 'draft' },
+      ])
     })
   })
 
@@ -112,7 +136,7 @@ describe('Drafts store', () => {
           [id]: {
             id,
             status: 'draft',
-          }
+          },
         })
       })
 
@@ -128,10 +152,10 @@ describe('Drafts store', () => {
         expect(storage.getItem).to.have.been.calledTwice
         expect(storage.setItem).to.have.been.calledTwice
         expect(storage.setItem).to.have.been.calledWith('pleroma-fe-drafts', {
-          '1': {
+          1: {
             id: '1',
             status: 'draft',
-          }
+          },
         })
       })
     })
@@ -157,14 +181,14 @@ describe('Drafts store', () => {
         expect(storage.getItem).to.have.been.calledOnce
         expect(storage.setItem).to.have.been.calledOnce
         expect(storage.setItem).to.have.been.calledWith('pleroma-fe-drafts', {
-          'a': {
+          a: {
             id: 'a',
             status: 'draft',
           },
-          'c': {
+          c: {
             id: 'c',
             status: 'draft',
-          }
+          },
         })
       })
     })
diff --git a/test/unit/specs/stores/follow_requests.spec.js b/test/unit/specs/stores/follow_requests.spec.js
new file mode 100644
index 000000000..d2b81680b
--- /dev/null
+++ b/test/unit/specs/stores/follow_requests.spec.js
@@ -0,0 +1,338 @@
+import { createTestingPinia } from '@pinia/testing'
+import { setActivePinia } from 'pinia'
+
+import { useFollowRequestsStore } from 'src/stores/follow_requests.js'
+import { useMergedConfigStore } from 'src/stores/merged_config.js'
+import { useNotificationsStore } from 'src/stores/notifications.js'
+import { useUsersStore } from 'src/stores/users.js'
+
+import * as USER_API from 'src/api/user.js'
+
+const mockMastoAPIUser = ({
+  screen_name = 'u1',
+  name = 'user1',
+  url = 'http://localhost/u1',
+  id = 'u1',
+} = {}) => ({
+  id,
+  acct: screen_name,
+  display_name: name,
+  fields: [],
+  avatar: '',
+  url,
+  pleroma: {
+    emoji_reactions: [],
+  },
+})
+
+describe('Follow Requests store', () => {
+  beforeEach(() => {
+    setActivePinia(createTestingPinia({ stubActions: false }))
+    vi.useFakeTimers()
+  })
+
+  afterEach(() => {
+    vi.useRealTimers()
+    vi.resetAllMocks()
+  })
+
+  describe('Getters', () => {
+    it('followRequestsCount returns total number of follow requests', async () => {
+      const store = useFollowRequestsStore()
+
+      store.requests = new Map([
+        ['1', {}],
+        ['2', {}],
+      ])
+
+      expect(store).to.have.property('followRequestsCount', 2)
+    })
+  })
+
+  describe('Actions', () => {
+    describe('Fetcher stuff', () => {
+      it('startFetching should initialize fetcher and fetch some data', async () => {
+        const store = useFollowRequestsStore()
+        const mockFetch = vi.fn()
+
+        mockFetch.mockResolvedValueOnce(
+          new Response(JSON.stringify([mockMastoAPIUser()]), {
+            headers: { 'Content-Type': 'application/json' },
+          }),
+        )
+
+        mockFetch.mockResolvedValueOnce(
+          new Response(JSON.stringify([mockMastoAPIUser()]), {
+            headers: { 'Content-Type': 'application/json' },
+          }),
+        )
+
+        vi.stubGlobal('fetch', mockFetch)
+
+        store.startFetching()
+        expect(store.fetcher).to.not.be.null
+
+        await vi.advanceTimersToNextTimerAsync()
+        expect(mockFetch).to.have.been.calledOnce
+
+        await vi.advanceTimersToNextTimerAsync()
+        expect(mockFetch).to.have.been.calledTwice
+        expect(useUsersStore().findUser('u1')).to.not.be.undefined
+        expect(store.requests.get('u1')).to.not.be.undefined
+      })
+
+      it('stopFetching should stop and remove the fetcher', async () => {
+        const store = useFollowRequestsStore()
+        const mockFetch = vi.fn()
+
+        mockFetch.mockResolvedValueOnce(
+          new Response(JSON.stringify([mockMastoAPIUser()]), {
+            headers: { 'Content-Type': 'application/json' },
+          }),
+        )
+
+        mockFetch.mockResolvedValueOnce(
+          new Response(JSON.stringify([mockMastoAPIUser()]), {
+            headers: { 'Content-Type': 'application/json' },
+          }),
+        )
+
+        vi.stubGlobal('fetch', mockFetch)
+
+        store.startFetching()
+        expect(store.fetcher).to.not.be.null
+
+        store.stopFetching()
+        expect(store.fetcher).to.be.null
+      })
+    })
+
+    describe.each(['Approve', 'Deny'])('%s', (intent) => {
+      const doCall = `do${intent}`
+      const apiCall = USER_API[`MASTODON_${intent.toUpperCase()}_USER_URL`]
+      const forkCall = intent.toLowerCase()
+      const forkProperty = `modalOn${intent}Follow`
+      const modalProperty = `showing${intent}ConfirmDialog`
+      const modalCalls = ['show', 'hide'].map(
+        (vis) => `${vis}${intent}ConfirmDialog`,
+      )
+
+
+      describe('Dialog calls', () => {
+        it(`${modalCalls[0]} should show dialog and set tempId`, async () => {
+          const store = useFollowRequestsStore()
+
+          await store[modalCalls[0]]('u13')
+
+          expect(store).to.have.property(modalProperty, true)
+          expect(store).to.have.property('tempId', 'u13')
+        })
+
+        it(`${modalCalls[1]} should hide dialog and clear tempId`, async () => {
+          const store = useFollowRequestsStore()
+
+          await store[modalCalls[1]]()
+
+          expect(store).to.have.property(modalProperty, false)
+          expect(store).to.have.property('tempId', null)
+        })
+      })
+
+      describe('Fork calls', () => {
+        it(`Should call ${doCall} if confirmations are disabled (${forkProperty} = false)`, async () => {
+          const store = useFollowRequestsStore()
+          const modalSpy = vi.spyOn(store, modalCalls[0]).mockImplementation(() => ({}))
+          const apiSpy = vi.spyOn(store, doCall).mockImplementation(() => ({}))
+          useMergedConfigStore().mergedConfig = { [forkProperty]: false }
+
+          await store[forkCall]('u23')
+
+          expect(modalSpy).to.not.have.been.called
+          expect(apiSpy).to.have.been.calledOnce
+          expect(apiSpy).to.have.been.calledWith('u23')
+        })
+
+        it(`Should call ${modalCalls[0]} if confirmations are enabled (${forkProperty} = true)`, async () => {
+          const store = useFollowRequestsStore()
+          const modalSpy = vi.spyOn(store, modalCalls[0]).mockImplementation(() => ({}))
+          const apiSpy = vi.spyOn(store, doCall).mockImplementation(() => ({}))
+          useMergedConfigStore().mergedConfig = { [forkProperty]: true }
+
+          await store[forkCall]('u23')
+
+          expect(modalSpy).to.have.been.called
+          expect(apiSpy).to.not.have.been.calledOnce
+        })
+      })
+
+      describe('Actual call', () => {
+        it('Should hide popover', async () => {
+          const store = useFollowRequestsStore()
+          const spy = vi.spyOn(store, modalCalls[1])
+          const mockFetch = vi.fn()
+
+          mockFetch.mockResolvedValueOnce(
+            new Response(JSON.stringify('ok'), {
+              headers: { 'Content-Type': 'application/json' },
+            }),
+          )
+
+          vi.stubGlobal('fetch', mockFetch)
+
+          await store[doCall]()
+
+          expect(spy).to.have.been.calledOnce
+        })
+
+        it('Should call API', async () => {
+          const store = useFollowRequestsStore()
+          const mockFetch = vi.fn()
+
+          mockFetch.mockResolvedValueOnce(
+            new Response(JSON.stringify('ok'), {
+              headers: { 'Content-Type': 'application/json' },
+            }),
+          )
+
+          vi.stubGlobal('fetch', mockFetch)
+
+          await store[doCall]('u99')
+
+          expect(mockFetch).to.have.been.calledOnce
+          expect(mockFetch.mock.calls[0][0]).to.eql(apiCall('u99'))
+        })
+
+        it('Should mark notification as seen', async () => {
+          const store = useFollowRequestsStore()
+          const mockFetch = vi.fn()
+          store.findFollowRequestNotificationId = vi.fn()
+          store.findFollowRequestNotificationId.mockReturnValue('n91')
+
+          const spy = vi.spyOn(useNotificationsStore(), 'markSingleNotificationAsSeen')
+
+          mockFetch.mockResolvedValueOnce(
+            new Response(JSON.stringify('ok'), {
+              headers: { 'Content-Type': 'application/json' },
+            }),
+          )
+
+          vi.stubGlobal('fetch', mockFetch)
+
+          await store[doCall]('u99')
+
+          expect(spy).to.have.been.calledOnce
+          expect(spy).to.have.been.calledWith('n91')
+        })
+
+        it('Should fallback to tempId if no id is provided', async () => {
+          const store = useFollowRequestsStore()
+          const mockFetch = vi.fn()
+
+          mockFetch.mockResolvedValueOnce(
+            new Response(JSON.stringify('ok'), {
+              headers: { 'Content-Type': 'application/json' },
+            }),
+          )
+
+          vi.stubGlobal('fetch', mockFetch)
+
+          store.tempId = 'u80'
+          await store[doCall]()
+
+          expect(mockFetch).to.have.been.calledOnce
+          expect(mockFetch.mock.calls[0][0]).to.eql(apiCall('u80'))
+        })
+
+        it('Should remove request from cache', async () => {
+          const store = useFollowRequestsStore()
+          const mockFetch = vi.fn()
+
+          store.requests.set('u95', { id: 'u95' })
+          store.requests.set('u96', { id: 'u96' })
+          store.requests.set('u97', { id: 'u97' })
+          store.requests.set('u98', { id: 'u98' })
+          store.requests.set('u99', { id: 'u99' })
+
+          mockFetch.mockResolvedValueOnce(
+            new Response(JSON.stringify('ok'), {
+              headers: { 'Content-Type': 'application/json' },
+            }),
+          )
+
+          vi.stubGlobal('fetch', mockFetch)
+
+          await store[doCall]('u99')
+
+          expect(store.requests).to.have.length(4)
+          expect(store.requests.get('u99')).to.be.undefined
+        })
+      })
+    })
+
+    describe('Utility', () => {
+      describe('findFollowRequestNotificationId', () => {
+        it('should search notifications store for relevant notification', () => {
+          const store = useFollowRequestsStore()
+
+          useNotificationsStore().data = [
+            {
+              id: 'n4',
+              from_profile: { id: 'u3' },
+              type: 'follow_request',
+            },
+            {
+              id: 'n3',
+              from_profile: { id: 'u2' },
+              type: 'repeat',
+            },
+            {
+              id: 'n2',
+              from_profile: { id: 'u1' },
+              type: 'follow_request',
+            },
+            {
+              id: 'n1',
+              from_profile: { id: 'u1' },
+              type: 'favorite',
+            },
+          ]
+
+          const result = store.findFollowRequestNotificationId('u1')
+
+          expect(result).to.have.eql('n2')
+        })
+
+        it("shouldn't crash if there is no notification available", () => {
+          const store = useFollowRequestsStore()
+
+          useNotificationsStore().data = [
+            {
+              id: 'n4',
+              from_profile: { id: 'u3' },
+              type: 'follow_request',
+            },
+            {
+              id: 'n3',
+              from_profile: { id: 'u2' },
+              type: 'repeat',
+            },
+            {
+              id: 'n2',
+              from_profile: { id: 'u1' },
+              type: 'follow_request',
+            },
+            {
+              id: 'n1',
+              from_profile: { id: 'u1' },
+              type: 'favorite',
+            },
+          ]
+
+          const result = store.findFollowRequestNotificationId('u5')
+
+          expect(result).to.have.eql(undefined)
+        })
+      })
+    })
+  })
+})

From e682a372d861c473ec2ddfe93decc359683ef64a Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Thu, 3 Sep 2026 21:23:14 +0300
Subject: [PATCH 11/18] drive-by: promiseInterval fetches on creation

---
 src/stores/fetchers/notifications_fetcher.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/stores/fetchers/notifications_fetcher.js b/src/stores/fetchers/notifications_fetcher.js
index 5403d59c9..26629f02f 100644
--- a/src/stores/fetchers/notifications_fetcher.js
+++ b/src/stores/fetchers/notifications_fetcher.js
@@ -118,8 +118,6 @@ const notificationsFetcher = (credentials) => {
   const startFetching = () => {
     if (interval.value) throw new Error('Interval already exists!')
 
-    fetchAndUpdate()
-
     interval.value = promiseInterval(fetchAndUpdate, 10000)
   }
 

From 325822287388ed8722e448187e3e86117dc46596 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Thu, 3 Sep 2026 21:30:01 +0300
Subject: [PATCH 12/18] lint

---
 test/unit/specs/stores/follow_requests.spec.js | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/test/unit/specs/stores/follow_requests.spec.js b/test/unit/specs/stores/follow_requests.spec.js
index d2b81680b..5e15b8004 100644
--- a/test/unit/specs/stores/follow_requests.spec.js
+++ b/test/unit/specs/stores/follow_requests.spec.js
@@ -117,7 +117,6 @@ describe('Follow Requests store', () => {
         (vis) => `${vis}${intent}ConfirmDialog`,
       )
 
-
       describe('Dialog calls', () => {
         it(`${modalCalls[0]} should show dialog and set tempId`, async () => {
           const store = useFollowRequestsStore()
@@ -141,7 +140,9 @@ describe('Follow Requests store', () => {
       describe('Fork calls', () => {
         it(`Should call ${doCall} if confirmations are disabled (${forkProperty} = false)`, async () => {
           const store = useFollowRequestsStore()
-          const modalSpy = vi.spyOn(store, modalCalls[0]).mockImplementation(() => ({}))
+          const modalSpy = vi
+            .spyOn(store, modalCalls[0])
+            .mockImplementation(() => ({}))
           const apiSpy = vi.spyOn(store, doCall).mockImplementation(() => ({}))
           useMergedConfigStore().mergedConfig = { [forkProperty]: false }
 
@@ -154,7 +155,9 @@ describe('Follow Requests store', () => {
 
         it(`Should call ${modalCalls[0]} if confirmations are enabled (${forkProperty} = true)`, async () => {
           const store = useFollowRequestsStore()
-          const modalSpy = vi.spyOn(store, modalCalls[0]).mockImplementation(() => ({}))
+          const modalSpy = vi
+            .spyOn(store, modalCalls[0])
+            .mockImplementation(() => ({}))
           const apiSpy = vi.spyOn(store, doCall).mockImplementation(() => ({}))
           useMergedConfigStore().mergedConfig = { [forkProperty]: true }
 
@@ -208,7 +211,10 @@ describe('Follow Requests store', () => {
           store.findFollowRequestNotificationId = vi.fn()
           store.findFollowRequestNotificationId.mockReturnValue('n91')
 
-          const spy = vi.spyOn(useNotificationsStore(), 'markSingleNotificationAsSeen')
+          const spy = vi.spyOn(
+            useNotificationsStore(),
+            'markSingleNotificationAsSeen',
+          )
 
           mockFetch.mockResolvedValueOnce(
             new Response(JSON.stringify('ok'), {

From 67bb642ffa650d193045476a0371e2679214e0ff Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Thu, 3 Sep 2026 21:33:03 +0300
Subject: [PATCH 13/18] fix test?

---
 test/unit/specs/stores/drafts.spec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/unit/specs/stores/drafts.spec.js b/test/unit/specs/stores/drafts.spec.js
index 9beb4587f..1a0667424 100644
--- a/test/unit/specs/stores/drafts.spec.js
+++ b/test/unit/specs/stores/drafts.spec.js
@@ -123,7 +123,7 @@ describe('Drafts store', () => {
     describe('addOrSaveDraft', () => {
       it('create draft', async () => {
         const store = useDraftsStore()
-        vi.setSystemTime(new Date(1997, 2, 29))
+        vi.setSystemTime(new Date(859586400000))
 
         const id = await store.addOrSaveDraft({ status: 'draft' })
 

From 6e04b28b719f95b53b526f568d69335ee577627e Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Thu, 3 Sep 2026 21:51:23 +0300
Subject: [PATCH 14/18] fix tests again

---
 test/unit/specs/stores/follow_requests.spec.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/test/unit/specs/stores/follow_requests.spec.js b/test/unit/specs/stores/follow_requests.spec.js
index 5e15b8004..20331a3fe 100644
--- a/test/unit/specs/stores/follow_requests.spec.js
+++ b/test/unit/specs/stores/follow_requests.spec.js
@@ -222,6 +222,12 @@ describe('Follow Requests store', () => {
             }),
           )
 
+          mockFetch.mockResolvedValueOnce(
+            new Response(JSON.stringify('ok'), {
+              headers: { 'Content-Type': 'application/json' },
+            }),
+          )
+
           vi.stubGlobal('fetch', mockFetch)
 
           await store[doCall]('u99')

From da53e35817ca1515bd5fb03c38702c286cab4bac Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Thu, 3 Sep 2026 23:19:56 +0300
Subject: [PATCH 15/18] add check

---
 src/stores/users.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/stores/users.js b/src/stores/users.js
index 2eeb31b6e..b487eab46 100644
--- a/src/stores/users.js
+++ b/src/stores/users.js
@@ -788,7 +788,9 @@ export const useUsersStore = defineStore('users', {
           useListsStore().startFetching()
           useBookmarkFoldersStore().startFetching()
           useChatsStore().startFetching()
-          useFollowRequestsStore().startFetching()
+          if (user.locked) {
+            useFollowRequestsStore().startFetching()
+          }
         })
         .finally(() => {
           useNotificationsStore().resume()

From 4b04488ce081f8be3674f04500a2cc8772add7fc Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Fri, 4 Sep 2026 00:17:24 +0300
Subject: [PATCH 16/18] handle errors

---
 src/i18n/en.json              |  2 ++
 src/stores/follow_requests.js | 45 ++++++++++++++++++++++++-----------
 2 files changed, 33 insertions(+), 14 deletions(-)

diff --git a/src/i18n/en.json b/src/i18n/en.json
index 0e861fe77..82c2c2637 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -1742,6 +1742,7 @@
     "approve_confirm_accept_button": "Approve",
     "approve_confirm_cancel_button": "Do not approve",
     "approve_confirm": "Do you want to approve {user}'s follow request?",
+    "approve_error": "Failure approving follow request: {error}",
     "block": "Block",
     "blocked": "Blocked!",
     "block_confirm_title": "Block confirmation",
@@ -1754,6 +1755,7 @@
     "deny_confirm_accept_button": "Deny",
     "deny_confirm_cancel_button": "Do not deny",
     "deny_confirm": "Do you want to deny {user}'s follow request?",
+    "deny_error": "Failure denying follow request: {error}",
     "edit_profile": "Edit profile",
     "favorites": "Favorites",
     "follow": "Follow",
diff --git a/src/stores/follow_requests.js b/src/stores/follow_requests.js
index 647821782..733d5cd63 100644
--- a/src/stores/follow_requests.js
+++ b/src/stores/follow_requests.js
@@ -4,6 +4,7 @@ import followRequestFetcher from 'src/stores/fetchers/follow_requests.js'
 import { useMergedConfigStore } from 'src/stores/merged_config.js'
 import { useNotificationsStore } from 'src/stores/notifications.js'
 import { useOAuthStore } from 'src/stores/oauth.js'
+import { useInterfaceStore } from 'src/stores/interface.js'
 
 import { approveUser, denyUser } from 'src/api/user.js'
 
@@ -79,27 +80,43 @@ export const useFollowRequestsStore = defineStore('followRequests', {
       const id = userId ?? this.tempId
       this.hideApproveConfirmDialog()
 
-      await approveUser({
-        id,
-        credentials: useOAuthStore().token,
-      })
+      try {
+        await approveUser({
+          id,
+          credentials: useOAuthStore().token,
+        })
 
-      const notifId = this.findFollowRequestNotificationId(id)
-      notifId && useNotificationsStore().markSingleNotificationAsSeen(notifId)
-      this.requests.delete(id)
+        const notifId = this.findFollowRequestNotificationId(id)
+        notifId && useNotificationsStore().markSingleNotificationAsSeen(notifId)
+        this.requests.delete(id)
+      } catch (error) {
+        useInterfaceStore().pushGlobalNotice({
+          messageKey: 'user_card.approve_error',
+          messageArgs: { error },
+          level: 'error',
+        })
+      }
     },
     async doDeny(userId) {
       const id = userId ?? this.tempId
       this.hideDenyConfirmDialog()
 
-      await denyUser({
-        id,
-        credentials: useOAuthStore().token,
-      })
+      try {
+        await denyUser({
+          id,
+          credentials: useOAuthStore().token,
+        })
 
-      const notifId = this.findFollowRequestNotificationId(id)
-      notifId && useNotificationsStore().markSingleNotificationAsSeen(notifId)
-      this.requests.delete(id)
+        const notifId = this.findFollowRequestNotificationId(id)
+        notifId && useNotificationsStore().markSingleNotificationAsSeen(notifId)
+        this.requests.delete(id)
+      } catch (error) {
+        useInterfaceStore().pushGlobalNotice({
+          messageKey: 'user_card.deny_error',
+          messageArgs: { error },
+          level: 'error',
+        })
+      }
     },
 
     // Utility

From ded8ae863dcab3156d4e475253ed6702a3d10627 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Fri, 4 Sep 2026 00:18:58 +0300
Subject: [PATCH 17/18] lint+fix

---
 src/stores/follow_requests.js | 2 +-
 src/stores/users.js           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/stores/follow_requests.js b/src/stores/follow_requests.js
index 733d5cd63..192239dcd 100644
--- a/src/stores/follow_requests.js
+++ b/src/stores/follow_requests.js
@@ -1,10 +1,10 @@
 import { defineStore } from 'pinia'
 
 import followRequestFetcher from 'src/stores/fetchers/follow_requests.js'
+import { useInterfaceStore } from 'src/stores/interface.js'
 import { useMergedConfigStore } from 'src/stores/merged_config.js'
 import { useNotificationsStore } from 'src/stores/notifications.js'
 import { useOAuthStore } from 'src/stores/oauth.js'
-import { useInterfaceStore } from 'src/stores/interface.js'
 
 import { approveUser, denyUser } from 'src/api/user.js'
 
diff --git a/src/stores/users.js b/src/stores/users.js
index b487eab46..dbe0b9d8b 100644
--- a/src/stores/users.js
+++ b/src/stores/users.js
@@ -788,7 +788,7 @@ export const useUsersStore = defineStore('users', {
           useListsStore().startFetching()
           useBookmarkFoldersStore().startFetching()
           useChatsStore().startFetching()
-          if (user.locked) {
+          if (this.currentUser.locked) {
             useFollowRequestsStore().startFetching()
           }
         })

From eaa75f55e6df32ece681244739918c12fe0567e0 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Fri, 4 Sep 2026 00:51:13 +0300
Subject: [PATCH 18/18] oops

---
 src/stores/users.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/stores/users.js b/src/stores/users.js
index dbe0b9d8b..6c40611b1 100644
--- a/src/stores/users.js
+++ b/src/stores/users.js
@@ -717,6 +717,7 @@ export const useUsersStore = defineStore('users', {
     },
     logout() {
       const oauth = useOAuthStore()
+      const locked = this.currentUser.locked
 
       // Pause fetching
       useNotificationsStore().pause()
@@ -727,7 +728,7 @@ export const useUsersStore = defineStore('users', {
       useListsStore().stopFetching()
       useBookmarkFoldersStore().stopFetching()
       useChatsStore().stopFetching()
-      if (this.currentUser.locked) {
+      if (locked) {
         useFollowRequestsStore().stopFetching()
       }
 
@@ -788,7 +789,7 @@ export const useUsersStore = defineStore('users', {
           useListsStore().startFetching()
           useBookmarkFoldersStore().startFetching()
           useChatsStore().startFetching()
-          if (this.currentUser.locked) {
+          if (locked) {
             useFollowRequestsStore().startFetching()
           }
         })