diff --git a/.github/workflows/versions.env b/.github/workflows/versions.env
index ed20f451..42a54038 100644
--- a/.github/workflows/versions.env
+++ b/.github/workflows/versions.env
@@ -1,2 +1,2 @@
-FLUTTER_VERSION=3.10.6
+FLUTTER_VERSION=3.13.0
 JAVA_VERSION=17
\ No newline at end of file
diff --git a/lib/pages/archive/archive_view.dart b/lib/pages/archive/archive_view.dart
index 00d7b89b..d0df690b 100644
--- a/lib/pages/archive/archive_view.dart
+++ b/lib/pages/archive/archive_view.dart
@@ -30,7 +30,7 @@ class ArchiveView extends StatelessWidget {
                   label: Text(L10n.of(context)!.clearArchive),
                   icon: const Icon(Icons.cleaning_services_outlined),
                 ),
-              )
+              ),
           ],
         ),
         body: MaxWidthBody(
diff --git a/lib/pages/bootstrap/bootstrap_dialog.dart b/lib/pages/bootstrap/bootstrap_dialog.dart
index d99272e8..20128b06 100644
--- a/lib/pages/bootstrap/bootstrap_dialog.dart
+++ b/lib/pages/bootstrap/bootstrap_dialog.dart
@@ -377,7 +377,7 @@ class BootstrapDialogState extends State<BootstrapDialog> {
                                 setState(() => _createBootstrap(true));
                               }
                             },
-                    )
+                    ),
                   ],
                 ),
               ),
diff --git a/lib/pages/chat/add_widget_tile_view.dart b/lib/pages/chat/add_widget_tile_view.dart
index 23118e72..7ce441e8 100644
--- a/lib/pages/chat/add_widget_tile_view.dart
+++ b/lib/pages/chat/add_widget_tile_view.dart
@@ -67,7 +67,7 @@ class AddWidgetTileView extends StatelessWidget {
               child: Text(L10n.of(context)!.addWidget),
             ),
           ],
-        )
+        ),
       ],
     );
   }
diff --git a/lib/pages/chat/chat.dart b/lib/pages/chat/chat.dart
index cb501f24..885c0ae9 100644
--- a/lib/pages/chat/chat.dart
+++ b/lib/pages/chat/chat.dart
@@ -547,7 +547,7 @@ class ChatController extends State<ChatPageWithRoom> {
           MatrixImageFile(
             bytes: bytes,
             name: file.path,
-          )
+          ),
         ],
         room: room,
       ),
@@ -568,7 +568,7 @@ class ChatController extends State<ChatPageWithRoom> {
           MatrixVideoFile(
             bytes: bytes,
             name: file.path,
-          )
+          ),
         ],
         room: room,
       ),
diff --git a/lib/pages/chat/chat_input_row.dart b/lib/pages/chat/chat_input_row.dart
index 30c38ca5..7d2d083a 100644
--- a/lib/pages/chat/chat_input_row.dart
+++ b/lib/pages/chat/chat_input_row.dart
@@ -78,7 +78,7 @@ class ChatInputRow extends StatelessWidget {
               KeyBoardShortcuts(
                 keysToPress: {
                   LogicalKeyboardKey.altLeft,
-                  LogicalKeyboardKey.keyA
+                  LogicalKeyboardKey.keyA,
                 },
                 onKeysPressed: () =>
                     controller.onAddPopupMenuButtonSelected('file'),
@@ -184,7 +184,7 @@ class ChatInputRow extends StatelessWidget {
                 child: KeyBoardShortcuts(
                   keysToPress: {
                     LogicalKeyboardKey.altLeft,
-                    LogicalKeyboardKey.keyE
+                    LogicalKeyboardKey.keyE,
                   },
                   onKeysPressed: controller.emojiPickerAction,
                   helpLabel: L10n.of(context)!.emojis,
diff --git a/lib/pages/chat/chat_view.dart b/lib/pages/chat/chat_view.dart
index 87aa1e99..85273c22 100644
--- a/lib/pages/chat/chat_view.dart
+++ b/lib/pages/chat/chat_view.dart
@@ -120,7 +120,7 @@ class ChatView extends StatelessWidget {
             icon: const Icon(Icons.delete_forever_outlined),
             label: Text(L10n.of(context)!.delete),
           ),
-        )
+        ),
       ];
     } else {
       return [
diff --git a/lib/pages/chat/events/audio_player.dart b/lib/pages/chat/events/audio_player.dart
index 5f4bcafa..9ec7967b 100644
--- a/lib/pages/chat/events/audio_player.dart
+++ b/lib/pages/chat/events/audio_player.dart
@@ -248,7 +248,7 @@ class AudioPlayerState extends State<AudioPlayerWidget> {
                         ),
                       ),
                     ),
-                  )
+                  ),
               ],
             ),
           ),
diff --git a/lib/pages/chat/events/cute_events.dart b/lib/pages/chat/events/cute_events.dart
index ff9d3906..6b5b0f90 100644
--- a/lib/pages/chat/events/cute_events.dart
+++ b/lib/pages/chat/events/cute_events.dart
@@ -44,7 +44,7 @@ class _CuteContentState extends State<CuteContent> {
                 widget.event.text,
                 style: const TextStyle(fontSize: 150),
               ),
-              if (label != null) Text(label)
+              if (label != null) Text(label),
             ],
           ),
         );
diff --git a/lib/pages/chat/events/message.dart b/lib/pages/chat/events/message.dart
index 678b26ae..d19009e8 100644
--- a/lib/pages/chat/events/message.dart
+++ b/lib/pages/chat/events/message.dart
@@ -54,7 +54,7 @@ class Message extends StatelessWidget {
       EventTypes.Message,
       EventTypes.Sticker,
       EventTypes.Encrypted,
-      EventTypes.CallInvite
+      EventTypes.CallInvite,
     }.contains(event.type)) {
       if (event.type.startsWith('m.call.')) {
         return const SizedBox.shrink();
@@ -103,7 +103,7 @@ class Message extends StatelessWidget {
     final noBubble = {
           MessageTypes.Video,
           MessageTypes.Image,
-          MessageTypes.Sticker
+          MessageTypes.Sticker,
         }.contains(event.messageType) &&
         !event.redacted;
     final noPadding = {
@@ -222,7 +222,7 @@ class Message extends StatelessWidget {
                                           eventId: event.relationshipEventId!,
                                           content: {
                                             'msgtype': 'm.text',
-                                            'body': '...'
+                                            'body': '...',
                                           },
                                           senderId: event.senderId,
                                           type: 'm.room.message',
diff --git a/lib/pages/chat/events/message_content.dart b/lib/pages/chat/events/message_content.dart
index eba77d5c..2be0ba82 100644
--- a/lib/pages/chat/events/message_content.dart
+++ b/lib/pages/chat/events/message_content.dart
@@ -88,7 +88,7 @@ class MessageContent extends StatelessWidget {
                 event.calcLocalizedBodyFallback(
                   MatrixLocals(l10n),
                 ),
-              )
+              ),
             ],
           ),
         ),
diff --git a/lib/pages/chat/events/message_download_content.dart b/lib/pages/chat/events/message_download_content.dart
index ef609bee..42dcdff9 100644
--- a/lib/pages/chat/events/message_download_content.dart
+++ b/lib/pages/chat/events/message_download_content.dart
@@ -47,7 +47,7 @@ class MessageDownloadContent extends StatelessWidget {
                     ),
                     overflow: TextOverflow.ellipsis,
                   ),
-                )
+                ),
               ],
             ),
           ),
diff --git a/lib/pages/chat/events/message_reactions.dart b/lib/pages/chat/events/message_reactions.dart
index 77f87f4b..110553b9 100644
--- a/lib/pages/chat/events/message_reactions.dart
+++ b/lib/pages/chat/events/message_reactions.dart
@@ -217,7 +217,7 @@ class _AdaptableReactorsDialog extends StatelessWidget {
         runSpacing: 4.0,
         alignment: WrapAlignment.center,
         children: <Widget>[
-          for (var reactor in reactionEntry!.reactors!)
+          for (final reactor in reactionEntry!.reactors!)
             Chip(
               avatar: Avatar(
                 mxContent: reactor.avatarUrl,
diff --git a/lib/pages/chat/events/verification_request_content.dart b/lib/pages/chat/events/verification_request_content.dart
index 257b9f31..a7271125 100644
--- a/lib/pages/chat/events/verification_request_content.dart
+++ b/lib/pages/chat/events/verification_request_content.dart
@@ -60,7 +60,7 @@ class VerificationRequestContent extends StatelessWidget {
                         : (started
                             ? L10n.of(context)!.loadingPleaseWait
                             : L10n.of(context)!.newVerificationRequest)),
-              )
+              ),
             ],
           ),
         ),
diff --git a/lib/pages/chat/input_bar.dart b/lib/pages/chat/input_bar.dart
index d6f6794b..cdff8e21 100644
--- a/lib/pages/chat/input_bar.dart
+++ b/lib/pages/chat/input_bar.dart
@@ -407,7 +407,7 @@ class InputBar extends StatelessWidget {
               LogicalKeySet(
                 LogicalKeyboardKey.controlLeft,
                 LogicalKeyboardKey.keyM,
-              ): PasteLineIntent()
+              ): PasteLineIntent(),
             },
       child: Actions(
         actions: !useShortCuts
@@ -443,7 +443,7 @@ class InputBar extends StatelessWidget {
                     }
                     return null;
                   },
-                )
+                ),
               },
         child: TypeAheadField<Map<String, String?>>(
           direction: AxisDirection.up,
diff --git a/lib/pages/chat/reactions_picker.dart b/lib/pages/chat/reactions_picker.dart
index c5881295..4ae5505f 100644
--- a/lib/pages/chat/reactions_picker.dart
+++ b/lib/pages/chat/reactions_picker.dart
@@ -99,7 +99,7 @@ class ReactionsPicker extends StatelessWidget {
                   ),
                   onTap: () =>
                       controller.pickEmojiReactionAction(allReactionEvents),
-                )
+                ),
               ],
             );
           },
diff --git a/lib/pages/chat/send_file_dialog.dart b/lib/pages/chat/send_file_dialog.dart
index dff80548..11b61db7 100644
--- a/lib/pages/chat/send_file_dialog.dart
+++ b/lib/pages/chat/send_file_dialog.dart
@@ -100,7 +100,7 @@ class SendFileDialogState extends State<SendFileDialog> {
                 child: Text('${L10n.of(context)!.sendOriginal} ($sizeString)'),
               ),
             ],
-          )
+          ),
         ],
       );
     } else {
diff --git a/lib/pages/chat_details/chat_details.dart b/lib/pages/chat_details/chat_details.dart
index fd70ac58..1cadf26b 100644
--- a/lib/pages/chat_details/chat_details.dart
+++ b/lib/pages/chat_details/chat_details.dart
@@ -53,7 +53,7 @@ class ChatDetailsController extends State<ChatDetails> {
               L10n.of(context)!,
             ),
           ),
-        )
+        ),
       ],
     );
     if (input == null) return;
@@ -184,7 +184,7 @@ class ChatDetailsController extends State<ChatDetails> {
           suffixText: domain,
           hintText: L10n.of(context)!.alias,
           initialText: room.canonicalAlias.localpart,
-        )
+        ),
       ],
     );
     if (input == null) return;
@@ -208,7 +208,7 @@ class ChatDetailsController extends State<ChatDetails> {
           initialText: room.topic,
           minLines: 4,
           maxLines: 8,
-        )
+        ),
       ],
     );
     if (input == null) return;
diff --git a/lib/pages/chat_details/chat_details_view.dart b/lib/pages/chat_details/chat_details_view.dart
index c4e02759..b7fd77bc 100644
--- a/lib/pages/chat_details/chat_details_view.dart
+++ b/lib/pages/chat_details/chat_details_view.dart
@@ -66,7 +66,7 @@ class ChatDetailsView extends StatelessWidget {
                           context,
                         ),
                       ),
-                    ChatSettingsPopupMenu(room, false)
+                    ChatSettingsPopupMenu(room, false),
                   ],
                   title: Text(L10n.of(context)!.chatDetails),
                   backgroundColor:
diff --git a/lib/pages/chat_list/chat_list.dart b/lib/pages/chat_list/chat_list.dart
index 391349a8..8c6dc67d 100644
--- a/lib/pages/chat_list/chat_list.dart
+++ b/lib/pages/chat_list/chat_list.dart
@@ -184,7 +184,7 @@ class ChatListController extends State<ChatList>
           validator: (server) => server?.contains('.') == true
               ? null
               : L10n.of(context)!.invalidServerName,
-        )
+        ),
       ],
     );
     if (newServer == null) return;
diff --git a/lib/pages/chat_list/chat_list_view.dart b/lib/pages/chat_list/chat_list_view.dart
index 0ac9b30b..1208fb88 100644
--- a/lib/pages/chat_list/chat_list_view.dart
+++ b/lib/pages/chat_list/chat_list_view.dart
@@ -194,7 +194,7 @@ class ChatListView extends StatelessWidget {
                     floatingActionButton: KeyBoardShortcuts(
                       keysToPress: {
                         LogicalKeyboardKey.controlLeft,
-                        LogicalKeyboardKey.keyN
+                        LogicalKeyboardKey.keyN,
                       },
                       onKeysPressed: () => context.go('/rooms/newprivatechat'),
                       helpLabel: L10n.of(context)!.newChat,
diff --git a/lib/pages/chat_list/client_chooser_button.dart b/lib/pages/chat_list/client_chooser_button.dart
index 46783577..2791a4a0 100644
--- a/lib/pages/chat_list/client_chooser_button.dart
+++ b/lib/pages/chat_list/client_chooser_button.dart
@@ -195,7 +195,7 @@ class ClientChooserButton extends StatelessWidget {
           KeyBoardShortcuts(
             keysToPress: {
               LogicalKeyboardKey.controlLeft,
-              LogicalKeyboardKey.tab
+              LogicalKeyboardKey.tab,
             },
             helpLabel: L10n.of(context)!.nextAccount,
             onKeysPressed: () => _nextAccount(matrix, context),
@@ -205,7 +205,7 @@ class ClientChooserButton extends StatelessWidget {
             keysToPress: {
               LogicalKeyboardKey.controlLeft,
               LogicalKeyboardKey.shiftLeft,
-              LogicalKeyboardKey.tab
+              LogicalKeyboardKey.tab,
             },
             helpLabel: L10n.of(context)!.previousAccount,
             onKeysPressed: () => _previousAccount(matrix, context),
@@ -235,7 +235,7 @@ class ClientChooserButton extends StatelessWidget {
     if (index > 0 && index < 10) {
       return {
         LogicalKeyboardKey.altLeft,
-        LogicalKeyboardKey(0x00000000030 + index)
+        LogicalKeyboardKey(0x00000000030 + index),
       };
     } else {
       return null;
diff --git a/lib/pages/chat_list/space_view.dart b/lib/pages/chat_list/space_view.dart
index ee2d5a0b..8bbb6369 100644
--- a/lib/pages/chat_list/space_view.dart
+++ b/lib/pages/chat_list/space_view.dart
@@ -212,7 +212,7 @@ class _SpaceViewState extends State<SpaceView> {
               IconButton(
                 onPressed: _refresh,
                 icon: const Icon(Icons.refresh_outlined),
-              )
+              ),
             ],
           );
         }
diff --git a/lib/pages/chat_list/stories_header.dart b/lib/pages/chat_list/stories_header.dart
index 25e666b4..ab6caabb 100644
--- a/lib/pages/chat_list/stories_header.dart
+++ b/lib/pages/chat_list/stories_header.dart
@@ -331,7 +331,7 @@ class _StoryButtonState extends State<_StoryButton> {
                                 ],
                               ),
                             ),
-                          ]
+                          ],
                         ],
                       ),
                     ),
diff --git a/lib/pages/chat_permissions_settings/chat_permissions_settings_view.dart b/lib/pages/chat_permissions_settings/chat_permissions_settings_view.dart
index cbebb23b..fd10b9af 100644
--- a/lib/pages/chat_permissions_settings/chat_permissions_settings_view.dart
+++ b/lib/pages/chat_permissions_settings/chat_permissions_settings_view.dart
@@ -45,7 +45,7 @@ class ChatPermissionsSettingsView extends StatelessWidget {
                 Column(
                   mainAxisSize: MainAxisSize.min,
                   children: [
-                    for (var entry in powerLevels.entries)
+                    for (final entry in powerLevels.entries)
                       PermissionsListTile(
                         permissionKey: entry.key,
                         permission: entry.value,
@@ -95,7 +95,7 @@ class ChatPermissionsSettingsView extends StatelessWidget {
                         ),
                       ),
                     ),
-                    for (var entry in eventsPowerLevels.entries)
+                    for (final entry in eventsPowerLevels.entries)
                       PermissionsListTile(
                         permissionKey: entry.key,
                         category: 'events',
diff --git a/lib/pages/device_settings/device_settings.dart b/lib/pages/device_settings/device_settings.dart
index f0b541ca..1f6a5eb6 100644
--- a/lib/pages/device_settings/device_settings.dart
+++ b/lib/pages/device_settings/device_settings.dart
@@ -74,7 +74,7 @@ class DevicesSettingsController extends State<DevicesSettings> {
       textFields: [
         DialogTextField(
           hintText: device.displayName,
-        )
+        ),
       ],
     );
     if (displayName == null) return;
diff --git a/lib/pages/dialer/dialer.dart b/lib/pages/dialer/dialer.dart
index 22e76fd8..a7862807 100644
--- a/lib/pages/dialer/dialer.dart
+++ b/lib/pages/dialer/dialer.dart
@@ -108,7 +108,7 @@ class _StreamView extends StatelessWidget {
                 color: Colors.white,
                 size: 18.0,
               ),
-            )
+            ),
         ],
       ),
     );
@@ -503,7 +503,7 @@ class MyCallingPage extends State<Calling> {
                   color: Colors.white,
                   fontSize: 24.0,
                 ),
-              )
+              ),
             ],
           ),
         ),
@@ -639,7 +639,7 @@ class MyCallingPage extends State<Calling> {
                             PIPView.of(context)?.setFloating(true);
                           },
                         ),
-                      )
+                      ),
                   ],
                 ),
               );
diff --git a/lib/pages/image_viewer/image_viewer_view.dart b/lib/pages/image_viewer/image_viewer_view.dart
index 0bfdff2f..3bd6166c 100644
--- a/lib/pages/image_viewer/image_viewer_view.dart
+++ b/lib/pages/image_viewer/image_viewer_view.dart
@@ -48,7 +48,7 @@ class ImageViewerView extends StatelessWidget {
                 color: Colors.white,
                 icon: Icon(Icons.adaptive.share_outlined),
               ),
-            )
+            ),
         ],
       ),
       body: InteractiveViewer(
diff --git a/lib/pages/key_verification/key_verification_dialog.dart b/lib/pages/key_verification/key_verification_dialog.dart
index b79da1ae..7d9633cc 100644
--- a/lib/pages/key_verification/key_verification_dialog.dart
+++ b/lib/pages/key_verification/key_verification_dialog.dart
@@ -179,7 +179,7 @@ class KeyVerificationPageState extends State<KeyVerificationDialog> {
             const SizedBox(height: 16),
             Text(
               L10n.of(context)!.askVerificationRequest(displayName),
-            )
+            ),
           ],
         );
         buttons.add(
diff --git a/lib/pages/new_private_chat/new_private_chat_view.dart b/lib/pages/new_private_chat/new_private_chat_view.dart
index e3855058..4672633b 100644
--- a/lib/pages/new_private_chat/new_private_chat_view.dart
+++ b/lib/pages/new_private_chat/new_private_chat_view.dart
@@ -38,7 +38,7 @@ class NewPrivateChatView extends StatelessWidget {
                     TextStyle(color: Theme.of(context).colorScheme.secondary),
               ),
             ),
-          )
+          ),
         ],
       ),
       body: Column(
diff --git a/lib/pages/settings/settings.dart b/lib/pages/settings/settings.dart
index e3465363..368f0986 100644
--- a/lib/pages/settings/settings.dart
+++ b/lib/pages/settings/settings.dart
@@ -43,7 +43,7 @@ class SettingsController extends State<Settings> {
         DialogTextField(
           initialText: profile?.displayName ??
               Matrix.of(context).client.userID!.localpart,
-        )
+        ),
       ],
     );
     if (input == null) return;
diff --git a/lib/pages/settings_3pid/settings_3pid_view.dart b/lib/pages/settings_3pid/settings_3pid_view.dart
index 729ad74f..245077d9 100644
--- a/lib/pages/settings_3pid/settings_3pid_view.dart
+++ b/lib/pages/settings_3pid/settings_3pid_view.dart
@@ -24,7 +24,7 @@ class Settings3PidView extends StatelessWidget {
             icon: const Icon(Icons.add_outlined),
             onPressed: controller.add3PidAction,
             tooltip: L10n.of(context)!.addEmail,
-          )
+          ),
         ],
       ),
       body: MaxWidthBody(
diff --git a/lib/pages/settings_emotes/import_archive_dialog.dart b/lib/pages/settings_emotes/import_archive_dialog.dart
index 0e3343a9..faf06912 100644
--- a/lib/pages/settings_emotes/import_archive_dialog.dart
+++ b/lib/pages/settings_emotes/import_archive_dialog.dart
@@ -258,7 +258,7 @@ class _EmojiImportPreviewState extends State<_EmojiImportPreview> {
                   child: TextField(
                     controller: controller,
                     inputFormatters: [
-                      FilteringTextInputFormatter.allow(RegExp(r'^[-\w]+$'))
+                      FilteringTextInputFormatter.allow(RegExp(r'^[-\w]+$')),
                     ],
                     autocorrect: false,
                     minLines: 1,
diff --git a/lib/pages/settings_notifications/settings_notifications.dart b/lib/pages/settings_notifications/settings_notifications.dart
index 53cb5d16..ff9dcbd3 100644
--- a/lib/pages/settings_notifications/settings_notifications.dart
+++ b/lib/pages/settings_notifications/settings_notifications.dart
@@ -111,7 +111,7 @@ class SettingsNotificationsController extends State<SettingsNotifications> {
           label: L10n.of(context)!.delete,
           isDestructiveAction: true,
           key: true,
-        )
+        ),
       ],
     );
     if (delete != true) return;
diff --git a/lib/pages/settings_notifications/settings_notifications_view.dart b/lib/pages/settings_notifications/settings_notifications_view.dart
index 4128a4e2..0cdef98d 100644
--- a/lib/pages/settings_notifications/settings_notifications_view.dart
+++ b/lib/pages/settings_notifications/settings_notifications_view.dart
@@ -57,7 +57,7 @@ class SettingsNotificationsView extends StatelessWidget {
                       ),
                     ),
                   ),
-                  for (var item in NotificationSettingsItem.items)
+                  for (final item in NotificationSettingsItem.items)
                     SwitchListTile.adaptive(
                       value: controller.getNotificationSetting(item) ?? true,
                       title: Text(item.title(context)),
diff --git a/lib/pages/settings_security/settings_security.dart b/lib/pages/settings_security/settings_security.dart
index 40950a7d..183c01ea 100644
--- a/lib/pages/settings_security/settings_security.dart
+++ b/lib/pages/settings_security/settings_security.dart
@@ -86,7 +86,7 @@ class SettingsSecurityController extends State<SettingsSecurity> {
           obscureText: true,
           maxLines: 1,
           minLines: 1,
-        )
+        ),
       ],
     );
     if (newLock != null) {
@@ -142,7 +142,7 @@ class SettingsSecurityController extends State<SettingsSecurity> {
           hintText: '******',
           minLines: 1,
           maxLines: 1,
-        )
+        ),
       ],
     );
     if (input == null) return;
diff --git a/lib/utils/custom_scroll_behaviour.dart b/lib/utils/custom_scroll_behaviour.dart
index c9610c1c..719b7547 100644
--- a/lib/utils/custom_scroll_behaviour.dart
+++ b/lib/utils/custom_scroll_behaviour.dart
@@ -6,6 +6,6 @@ class CustomScrollBehavior extends MaterialScrollBehavior {
   Set<PointerDeviceKind> get dragDevices => {
         PointerDeviceKind.touch,
         PointerDeviceKind.mouse,
-        PointerDeviceKind.trackpad
+        PointerDeviceKind.trackpad,
       };
 }
diff --git a/lib/utils/matrix_sdk_extensions/filtered_timeline_extension.dart b/lib/utils/matrix_sdk_extensions/filtered_timeline_extension.dart
index 479685c1..7ae2bf0c 100644
--- a/lib/utils/matrix_sdk_extensions/filtered_timeline_extension.dart
+++ b/lib/utils/matrix_sdk_extensions/filtered_timeline_extension.dart
@@ -40,6 +40,6 @@ extension IsStateExtension on Event {
   bool get isState => !{
         EventTypes.Message,
         EventTypes.Sticker,
-        EventTypes.Encrypted
+        EventTypes.Encrypted,
       }.contains(type);
 }
diff --git a/lib/utils/uia_request_manager.dart b/lib/utils/uia_request_manager.dart
index 94318930..04c8b484 100644
--- a/lib/utils/uia_request_manager.dart
+++ b/lib/utils/uia_request_manager.dart
@@ -32,7 +32,7 @@ extension UiaRequestManager on MatrixState {
                     maxLines: 1,
                     obscureText: true,
                     hintText: '******',
-                  )
+                  ),
                 ],
               ))
                   ?.single;
diff --git a/lib/widgets/chat_settings_popup_menu.dart b/lib/widgets/chat_settings_popup_menu.dart
index 835f9f44..fbbb4978 100644
--- a/lib/widgets/chat_settings_popup_menu.dart
+++ b/lib/widgets/chat_settings_popup_menu.dart
@@ -96,7 +96,7 @@ class ChatSettingsPopupMenuState extends State<ChatSettingsPopupMenu> {
         KeyBoardShortcuts(
           keysToPress: {
             LogicalKeyboardKey.controlLeft,
-            LogicalKeyboardKey.keyI
+            LogicalKeyboardKey.keyI,
           },
           helpLabel: L10n.of(context)!.chatDetails,
           onKeysPressed: _showChatDetails,
diff --git a/lib/widgets/matrix.dart b/lib/widgets/matrix.dart
index fc1d0a52..2c26de59 100644
--- a/lib/widgets/matrix.dart
+++ b/lib/widgets/matrix.dart
@@ -229,8 +229,8 @@ class MatrixState extends State<Matrix> with WidgetsBindingObserver {
   bool webHasFocus = true;
 
   String? get activeRoomId {
-    final route = FluffyChatApp.router.routeInformationProvider.value.location;
-    if (route == null || !route.startsWith('/rooms/')) return null;
+    final route = FluffyChatApp.router.routeInformationProvider.value.uri.path;
+    if (!route.startsWith('/rooms/')) return null;
     return route.split('/')[2];
   }
 
diff --git a/lib/widgets/permission_slider_dialog.dart b/lib/widgets/permission_slider_dialog.dart
index 9aca4ff2..8f895898 100644
--- a/lib/widgets/permission_slider_dialog.dart
+++ b/lib/widgets/permission_slider_dialog.dart
@@ -61,7 +61,7 @@ Future<int?> showPermissionChooser(
             initialText: currentLevel.toString(),
             keyboardType: TextInputType.number,
             autocorrect: false,
-          )
+          ),
         ],
       );
       if (customLevel == null) return null;
diff --git a/pubspec.lock b/pubspec.lock
index 590cd54e..1ea784b5 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -13,10 +13,10 @@ packages:
     dependency: "direct main"
     description:
       name: adaptive_dialog
-      sha256: "2dc70b30899398ed0d2949e1ea9b1ee467fe700b4181ec33457737eaaf06b488"
+      sha256: "3b8abc7d1ba0834061759ee0be8e623eff5bffbcd1e6df5608a11983cfad6b2b"
       url: "https://pub.dev"
     source: hosted
-    version: "1.9.0-x-macos-beta.1"
+    version: "1.9.0"
   analyzer:
     dependency: transitive
     description:
@@ -173,18 +173,18 @@ packages:
     dependency: "direct main"
     description:
       name: collection
-      sha256: "4a07be6cb69c84d677a6c3096fcf960cc3285a8330b4603e0d463d15d9bd934c"
+      sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687
       url: "https://pub.dev"
     source: hosted
-    version: "1.17.1"
+    version: "1.17.2"
   connectivity_plus:
     dependency: "direct main"
     description:
       name: connectivity_plus
-      sha256: "8599ae9edca5ff96163fca3e36f8e481ea917d1e71cdad912c084b5579913f34"
+      sha256: "77a180d6938f78ca7d2382d2240eb626c0f6a735d0bfdce227d8ffb80f95c48b"
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.1"
+    version: "4.0.2"
   connectivity_plus_platform_interface:
     dependency: transitive
     description:
@@ -245,10 +245,10 @@ packages:
     dependency: "direct dev"
     description:
       name: dart_code_metrics
-      sha256: "1dc1fa763b73ed52147bd91b015d81903edc3f227b77b1672fcddba43390ed18"
+      sha256: "3dede3f7abc077a4181ec7445448a289a9ce08e2981e6a4d49a3fb5099d47e1f"
       url: "https://pub.dev"
     source: hosted
-    version: "5.7.5"
+    version: "5.7.6"
   dart_code_metrics_presets:
     dependency: transitive
     description:
@@ -269,10 +269,10 @@ packages:
     dependency: transitive
     description:
       name: dart_webrtc
-      sha256: "3f581ea799829fabd6e0b99bd2210146e4d107c7b3ac8495af3510737a5c5c1a"
+      sha256: dfe42714abe3eb83eefec407c9da7f8e341a899aa1b8ac2484af298cdfeb74a3
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.1"
+    version: "1.1.2"
   dbus:
     dependency: transitive
     description:
@@ -309,10 +309,10 @@ packages:
     dependency: "direct main"
     description:
       name: device_info_plus
-      sha256: "2c35b6d1682b028e42d07b3aee4b98fa62996c10bc12cb651ec856a80d6a761b"
+      sha256: "86add5ef97215562d2e090535b0a16f197902b10c369c558a100e74ea06e8659"
       url: "https://pub.dev"
     source: hosted
-    version: "9.0.2"
+    version: "9.0.3"
   device_info_plus_platform_interface:
     dependency: transitive
     description:
@@ -373,10 +373,10 @@ packages:
     dependency: transitive
     description:
       name: ffi
-      sha256: ed5337a5660c506388a9f012be0288fb38b49020ce2b45fe1f8b8323fe429f99
+      sha256: "7bf0adc28a23d395f19f3f1eb21dd7cfd1dd9f8e1c50051c069122e6853bc878"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.2"
+    version: "2.1.0"
   file:
     dependency: transitive
     description:
@@ -389,7 +389,7 @@ packages:
     dependency: "direct main"
     description:
       name: file_picker
-      sha256: b1729fc96627dd44012d0a901558177418818d6bd428df59dcfeb594e5f66432
+      sha256: "21145c9c268d54b1f771d8380c195d2d6f655e0567dc1ca2f9c134c02c819e0a"
       url: "https://pub.dev"
     source: hosted
     version: "5.3.3"
@@ -405,10 +405,10 @@ packages:
     dependency: transitive
     description:
       name: file_selector_macos
-      sha256: "7a6f1ae6107265664f3f7f89a66074882c4d506aef1441c9af313c1f7e6f41ce"
+      sha256: "4ada532862917bf16e3adb3891fe3a5917a58bae03293e497082203a80909412"
       url: "https://pub.dev"
     source: hosted
-    version: "0.9.3"
+    version: "0.9.3+1"
   file_selector_platform_interface:
     dependency: transitive
     description:
@@ -620,10 +620,10 @@ packages:
     dependency: "direct dev"
     description:
       name: flutter_native_splash
-      sha256: ba45d8cfbd778478a74696b012f33ffb6b1760c9bc531b21e2964444a4870dae
+      sha256: ecff62b3b893f2f665de7e4ad3de89f738941fcfcaaba8ee601e749efafa4698
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.1"
+    version: "2.3.2"
   flutter_olm:
     dependency: "direct main"
     description:
@@ -750,10 +750,10 @@ packages:
     dependency: "direct main"
     description:
       name: flutter_webrtc
-      sha256: "6a26a2ca8e1759fe60705d745444184e384508b82feb68547d66d411dbc4ad2d"
+      sha256: "770c6f8babfdc4907539dc57bf9e98b89132eaa4486bac774c537dd25c2d5362"
       url: "https://pub.dev"
     source: hosted
-    version: "0.9.37"
+    version: "0.9.40"
   fuchsia_remote_debug_protocol:
     dependency: transitive
     description: flutter
@@ -827,10 +827,10 @@ packages:
     dependency: "direct main"
     description:
       name: go_router
-      sha256: b3cadd2cd59a4103fd5f6bc572ca75111264698784e927aa471921c3477d5475
+      sha256: "2aa884667eeda3a1c461f31e72af1f77984ab0f29450d8fb12ec1f7bc53eea14"
       url: "https://pub.dev"
     source: hosted
-    version: "10.0.0"
+    version: "10.1.0"
   handy_window:
     dependency: "direct main"
     description:
@@ -907,26 +907,26 @@ packages:
     dependency: "direct main"
     description:
       name: image_picker
-      sha256: b9603755b35253ccfad4be0762bb74d5e8bf9ff75edebf0ac3beec24fac1c5b5
+      sha256: "841837258e0b42c80946c43443054fc726f5e8aa84a97f363eb9ef0d45b33c14"
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.0"
+    version: "1.0.2"
   image_picker_android:
     dependency: transitive
     description:
       name: image_picker_android
-      sha256: d2bab152deb2547ea6f53d82ebca9b7e77386bb706e5789e815d37e08ea475bb
+      sha256: "8179b54039b50eee561676232304f487602e2950ffb3e8995ed9034d6505ca34"
       url: "https://pub.dev"
     source: hosted
-    version: "0.8.7+3"
+    version: "0.8.7+4"
   image_picker_for_web:
     dependency: transitive
     description:
       name: image_picker_for_web
-      sha256: "869fe8a64771b7afbc99fc433a5f7be2fea4d1cb3d7c11a48b6b579eb9c797f0"
+      sha256: "8b6c160cdbe572199103a091c783685b236110e4a0fd7a4947f32ff5b7da8765"
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.0"
+    version: "3.0.0"
   image_picker_ios:
     dependency: transitive
     description:
@@ -955,10 +955,10 @@ packages:
     dependency: transitive
     description:
       name: image_picker_platform_interface
-      sha256: "7c7b96bb9413a9c28229e717e6fd1e3edd1cc5569c1778fcca060ecf729b65ee"
+      sha256: c1134543ae2187e85299996d21c526b2f403854994026d575ae4cf30d7bb2a32
       url: "https://pub.dev"
     source: hosted
-    version: "2.8.0"
+    version: "2.9.0"
   image_picker_windows:
     dependency: transitive
     description:
@@ -992,10 +992,10 @@ packages:
     dependency: "direct main"
     description:
       name: intl
-      sha256: a3715e3bc90294e971cb7dc063fbf3cd9ee0ebf8604ffeafabd9e6f16abbdbe6
+      sha256: "3bc132a9dbce73a7e4a21a17d06e1878839ffbf975568bc875c60537824b0c4d"
       url: "https://pub.dev"
     source: hosted
-    version: "0.18.0"
+    version: "0.18.1"
   js:
     dependency: transitive
     description:
@@ -1097,18 +1097,18 @@ packages:
     dependency: transitive
     description:
       name: macos_ui
-      sha256: ffea6ec01ceb12a9bdeaa88d83eef2fb24148f5c6a906ca345e1a4e021357db9
+      sha256: b739149b812c47e5ff10a00c9fdf7315f22ac5cd1fdbd447a6b7ffee31472717
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.0-beta.6"
+    version: "2.0.0"
   macos_window_utils:
     dependency: transitive
     description:
       name: macos_window_utils
-      sha256: b78a210aa70ca7ccad6e7b7b810fb4689c507f4a46e299214900b2a1eb70ea23
+      sha256: "43a90473f8786f00f07203e6819dab67e032f8896dafa4a6f85fbc71fba32c0b"
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.3"
+    version: "1.2.0"
   markdown:
     dependency: transitive
     description:
@@ -1121,18 +1121,18 @@ packages:
     dependency: transitive
     description:
       name: matcher
-      sha256: "6501fbd55da300384b768785b83e5ce66991266cec21af89ab9ae7f5ce1c4cbb"
+      sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e"
       url: "https://pub.dev"
     source: hosted
-    version: "0.12.15"
+    version: "0.12.16"
   material_color_utilities:
     dependency: transitive
     description:
       name: material_color_utilities
-      sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724
+      sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41"
       url: "https://pub.dev"
     source: hosted
-    version: "0.2.0"
+    version: "0.5.0"
   matrix:
     dependency: "direct main"
     description:
@@ -1185,10 +1185,10 @@ packages:
     dependency: "direct dev"
     description:
       name: msix
-      sha256: c8ebdd4670807904214889c4f9c447492439696814a0189b6a18a4d2f5e1290e
+      sha256: "76c87b8207323803169626a55afd78bbb8413c984df349a76598b9fbf9224677"
       url: "https://pub.dev"
     source: hosted
-    version: "3.15.0"
+    version: "3.16.1"
   native_imaging:
     dependency: "direct main"
     description:
@@ -1233,10 +1233,10 @@ packages:
     dependency: "direct main"
     description:
       name: package_info_plus
-      sha256: ceb027f6bc6a60674a233b4a90a7658af1aebdea833da0b5b53c1e9821a78c7b
+      sha256: "6ff267fcd9d48cb61c8df74a82680e8b82e940231bb5f68356672fde0397334a"
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.2"
+    version: "4.1.0"
   package_info_plus_platform_interface:
     dependency: transitive
     description:
@@ -1273,82 +1273,82 @@ packages:
     dependency: "direct main"
     description:
       name: path_provider
-      sha256: "3087813781ab814e4157b172f1a11c46be20179fcc9bea043e0fba36bc0acaa2"
+      sha256: "909b84830485dbcd0308edf6f7368bc8fd76afa26a270420f34cabea2a6467a0"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.15"
+    version: "2.1.0"
   path_provider_android:
     dependency: transitive
     description:
       name: path_provider_android
-      sha256: "2cec049d282c7f13c594b4a73976b0b4f2d7a1838a6dd5aaf7bd9719196bee86"
+      sha256: "5d44fc3314d969b84816b569070d7ace0f1dea04bd94a83f74c4829615d22ad8"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.27"
+    version: "2.1.0"
   path_provider_foundation:
     dependency: transitive
     description:
       name: path_provider_foundation
-      sha256: "1995d88ec2948dac43edf8fe58eb434d35d22a2940ecee1a9fefcd62beee6eb3"
+      sha256: "1b744d3d774e5a879bb76d6cd1ecee2ba2c6960c03b1020cd35212f6aa267ac5"
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.3"
+    version: "2.3.0"
   path_provider_linux:
     dependency: transitive
     description:
       name: path_provider_linux
-      sha256: ffbb8cc9ed2c9ec0e4b7a541e56fd79b138e8f47d2fb86815f15358a349b3b57
+      sha256: ba2b77f0c52a33db09fc8caf85b12df691bf28d983e84cf87ff6d693cfa007b3
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.11"
+    version: "2.2.0"
   path_provider_platform_interface:
     dependency: transitive
     description:
       name: path_provider_platform_interface
-      sha256: "57585299a729335f1298b43245842678cb9f43a6310351b18fb577d6e33165ec"
+      sha256: bced5679c7df11190e1ddc35f3222c858f328fff85c3942e46e7f5589bf9eb84
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.6"
+    version: "2.1.0"
   path_provider_windows:
     dependency: transitive
     description:
       name: path_provider_windows
-      sha256: "1cb68ba4cd3a795033de62ba1b7b4564dace301f952de6bfb3cd91b202b6ee96"
+      sha256: ee0e0d164516b90ae1f970bdf29f726f1aa730d7cfc449ecc74c495378b705da
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.7"
+    version: "2.2.0"
   permission_handler:
     dependency: "direct main"
     description:
       name: permission_handler
-      sha256: "415af30ba76a84faccfe1eb251fe1e4fdc790f876924c65ad7d6ed7a1404bcd6"
+      sha256: "63e5216aae014a72fe9579ccd027323395ce7a98271d9defa9d57320d001af81"
       url: "https://pub.dev"
     source: hosted
-    version: "10.4.2"
+    version: "10.4.3"
   permission_handler_android:
     dependency: transitive
     description:
       name: permission_handler_android
-      sha256: "3b61f3da3b1c83bc3fb6a2b431e8dab01d0e5b45f6a3d9c7609770ec88b2a89e"
+      sha256: "2ffaf52a21f64ac9b35fe7369bb9533edbd4f698e5604db8645b1064ff4cf221"
       url: "https://pub.dev"
     source: hosted
-    version: "10.3.0"
+    version: "10.3.3"
   permission_handler_apple:
     dependency: transitive
     description:
       name: permission_handler_apple
-      sha256: "7a187b671a39919462af2b5e813148365b71a615979165a119868d667fe90c03"
+      sha256: "99e220bce3f8877c78e4ace901082fb29fa1b4ebde529ad0932d8d664b34f3f5"
       url: "https://pub.dev"
     source: hosted
-    version: "9.1.3"
+    version: "9.1.4"
   permission_handler_platform_interface:
     dependency: transitive
     description:
       name: permission_handler_platform_interface
-      sha256: "463a07cb7cc6c758a7a1c7da36ce666bb80a0b4b5e92df0fa36872e0ed456993"
+      sha256: "7c6b1500385dd1d2ca61bb89e2488ca178e274a69144d26bbd65e33eae7c02a9"
       url: "https://pub.dev"
     source: hosted
-    version: "3.11.1"
+    version: "3.11.3"
   permission_handler_windows:
     dependency: transitive
     description:
@@ -1393,10 +1393,10 @@ packages:
     dependency: transitive
     description:
       name: plugin_platform_interface
-      sha256: "6a2128648c854906c53fa8e33986fc0247a1116122f9534dd20e3ab9e16a32bc"
+      sha256: "43798d895c929056255600343db8f049921cbec94d31ec87f1dc5c16c01935dd"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.4"
+    version: "2.1.5"
   pointer_interceptor:
     dependency: transitive
     description:
@@ -1609,18 +1609,18 @@ packages:
     dependency: "direct main"
     description:
       name: share_plus
-      sha256: ed3fcea4f789ed95913328e629c0c53e69e80e08b6c24542f1b3576046c614e8
+      sha256: "6cec740fa0943a826951223e76218df002804adb588235a8910dc3d6b0654e11"
       url: "https://pub.dev"
     source: hosted
-    version: "7.0.2"
+    version: "7.1.0"
   share_plus_platform_interface:
     dependency: transitive
     description:
       name: share_plus_platform_interface
-      sha256: "0c6e61471bd71b04a138b8b588fa388e66d8b005e6f2deda63371c5c505a0981"
+      sha256: "357412af4178d8e11d14f41723f80f12caea54cf0d5cd29af9dcdab85d58aea7"
       url: "https://pub.dev"
     source: hosted
-    version: "3.2.1"
+    version: "3.3.0"
   shared_preferences:
     dependency: "direct main"
     description:
@@ -1641,10 +1641,10 @@ packages:
     dependency: transitive
     description:
       name: shared_preferences_foundation
-      sha256: b046999bf0ff58f04c364491bb803dcfa8f42e47b19c75478f53d323684a8cc1
+      sha256: d29753996d8eb8f7619a1f13df6ce65e34bc107bef6330739ed76f18b22310ef
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.1"
+    version: "2.3.3"
   shared_preferences_linux:
     dependency: transitive
     description:
@@ -1694,26 +1694,26 @@ packages:
     dependency: transitive
     description:
       name: source_span
-      sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250
+      sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c"
       url: "https://pub.dev"
     source: hosted
-    version: "1.9.1"
+    version: "1.10.0"
   sqflite:
     dependency: transitive
     description:
       name: sqflite
-      sha256: b4d6710e1200e96845747e37338ea8a819a12b51689a3bcf31eff0003b37a0b9
+      sha256: "591f1602816e9c31377d5f008c2d9ef7b8aca8941c3f89cc5fd9d84da0c38a9a"
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.8+4"
+    version: "2.3.0"
   sqflite_common:
     dependency: transitive
     description:
       name: sqflite_common
-      sha256: "8f7603f3f8f126740bc55c4ca2d1027aab4b74a1267a3e31ce51fe40e3b65b8f"
+      sha256: "1b92f368f44b0dee2425bb861cfa17b6f6cf3961f762ff6f941d20b33355660a"
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.5+1"
+    version: "2.5.0"
   stack_trace:
     dependency: transitive
     description:
@@ -1774,10 +1774,10 @@ packages:
     dependency: transitive
     description:
       name: test_api
-      sha256: eb6ac1540b26de412b3403a163d919ba86f6a973fe6cc50ae3541b80092fdcfb
+      sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8"
       url: "https://pub.dev"
     source: hosted
-    version: "0.5.1"
+    version: "0.6.0"
   timezone:
     dependency: transitive
     description:
@@ -1870,10 +1870,10 @@ packages:
     dependency: transitive
     description:
       name: unifiedpush_android
-      sha256: "6a81d05ea62084deed46a68a010d78081eee2ded66f056b1f729c77a0c61327a"
+      sha256: "559124eb1d6bcc5d8f422c8b9a942e52cc704858e6f0afad4c449feef654f1a3"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.1"
+    version: "2.1.2"
   unifiedpush_platform_interface:
     dependency: transitive
     description:
@@ -1918,10 +1918,10 @@ packages:
     dependency: transitive
     description:
       name: url_launcher_android
-      sha256: "15f5acbf0dce90146a0f5a2c4a002b1814a6303c4c5c075aa2623b2d16156f03"
+      sha256: "3dd2388cc0c42912eee04434531a26a82512b9cb1827e0214430c9bcbddfe025"
       url: "https://pub.dev"
     source: hosted
-    version: "6.0.36"
+    version: "6.0.38"
   url_launcher_ios:
     dependency: transitive
     description:
@@ -1942,10 +1942,10 @@ packages:
     dependency: transitive
     description:
       name: url_launcher_macos
-      sha256: "91ee3e75ea9dadf38036200c5d3743518f4a5eb77a8d13fda1ee5764373f185e"
+      sha256: "1c4fdc0bfea61a70792ce97157e5cc17260f61abbe4f39354513f39ec6fd73b1"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.5"
+    version: "3.0.6"
   url_launcher_platform_interface:
     dependency: transitive
     description:
@@ -2046,18 +2046,18 @@ packages:
     dependency: transitive
     description:
       name: video_player_avfoundation
-      sha256: "4c274e439f349a0ee5cb3c42978393ede173a443b98f50de6ffe6900eaa19216"
+      sha256: f5f5b7fe8c865be8a57fe80c2dca130772e1db775b7af4e5c5aa1905069cfc6c
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.6"
+    version: "2.4.9"
   video_player_platform_interface:
     dependency: transitive
     description:
       name: video_player_platform_interface
-      sha256: a8c4dcae2a7a6e7cc1d7f9808294d968eca1993af34a98e95b9bdfa959bec684
+      sha256: "1ca9acd7a0fb15fb1a990cb554e6f004465c6f37c99d2285766f08a4b2802988"
       url: "https://pub.dev"
     source: hosted
-    version: "6.1.0"
+    version: "6.2.0"
   video_player_web:
     dependency: transitive
     description:
@@ -2078,10 +2078,10 @@ packages:
     dependency: transitive
     description:
       name: vm_service
-      sha256: f6deed8ed625c52864792459709183da231ebf66ff0cf09e69b573227c377efe
+      sha256: c620a6f783fa22436da68e42db7ebbf18b8c44b9a46ab911f666ff09ffd9153f
       url: "https://pub.dev"
     source: hosted
-    version: "11.3.0"
+    version: "11.7.1"
   wakelock:
     dependency: "direct main"
     description:
@@ -2110,10 +2110,10 @@ packages:
     dependency: transitive
     description:
       name: wakelock_plus
-      sha256: c10e99a5f943f4410e1ceb8432bd8c254151db3b6a7cb4f220c23a5d18d35157
+      sha256: aac3f3258f01781ec9212df94eecef1eb9ba9350e106728def405baa096ba413
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.0"
+    version: "1.1.1"
   wakelock_plus_platform_interface:
     dependency: transitive
     description:
@@ -2147,6 +2147,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.1.0"
+  web:
+    dependency: transitive
+    description:
+      name: web
+      sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.1.4-beta"
   webdriver:
     dependency: transitive
     description:
@@ -2159,18 +2167,18 @@ packages:
     dependency: "direct main"
     description:
       name: webrtc_interface
-      sha256: "0dd96f4d7fb6ba9895930644cebd3f1adb5179caa83cb1760061b2fe9cba5aad"
+      sha256: faec2b578f7cd588766843a8c59d4a0137c44de10b83341ce7bec05e104614d7
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.0"
+    version: "1.1.1"
   win32:
     dependency: transitive
     description:
       name: win32
-      sha256: dfdf0136e0aa7a1b474ea133e67cb0154a0acd2599c4f3ada3b49d38d38793ee
+      sha256: f2add6fa510d3ae152903412227bda57d0d5a8da61d2c39c1fb022c9429a41c0
       url: "https://pub.dev"
     source: hosted
-    version: "5.0.5"
+    version: "5.0.6"
   win32_registry:
     dependency: transitive
     description:
@@ -2199,10 +2207,10 @@ packages:
     dependency: transitive
     description:
       name: xdg_directories
-      sha256: ee1505df1426458f7f60aac270645098d318a8b4766d85fde75f76f2e21807d1
+      sha256: f0c26453a2d47aa4c2570c6a033246a3fc62da2fe23c7ffdd0a7495086dc0247
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.0"
+    version: "1.0.2"
   xml:
     dependency: transitive
     description:
@@ -2220,5 +2228,5 @@ packages:
     source: hosted
     version: "3.1.2"
 sdks:
-  dart: ">=3.0.0 <4.0.0"
+  dart: ">=3.1.0-185.0.dev <4.0.0"
   flutter: ">=3.10.0"
diff --git a/test/utils/test_client.dart b/test/utils/test_client.dart
index c2e1314c..55fccd03 100644
--- a/test/utils/test_client.dart
+++ b/test/utils/test_client.dart
@@ -25,7 +25,7 @@ Future<Client> prepareTestClient({
     databaseBuilder: FlutterHiveCollectionsDatabase.databaseBuilder,
     supportedLoginTypes: {
       AuthenticationTypes.password,
-      AuthenticationTypes.sso
+      AuthenticationTypes.sso,
     },
   );
   await client.checkHomeserver(homeserver);